diff --git a/cmd/common.go b/cmd/common.go
index 2e5f8798..61a9535b 100644
--- a/cmd/common.go
+++ b/cmd/common.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 	"time"
 
-	bmclibcomm "github.com/bmc-toolbox/common"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/google/uuid"
+	bmclibcomm "github.com/metal-toolbox/bmc-common"
 	coapiv1 "github.com/metal-toolbox/conditionorc/pkg/api/v1/conditions/types"
 	fleetdbapi "github.com/metal-toolbox/fleetdb/pkg/api/v1"
 	"github.com/metal-toolbox/mctl/internal/app"
diff --git a/go.mod b/go.mod
index 46028bfd..2272ad99 100644
--- a/go.mod
+++ b/go.mod
@@ -6,11 +6,11 @@ toolchain go1.23.1
 
 require (
 	github.com/adrg/xdg v0.5.3
-	github.com/bmc-toolbox/common v0.0.0-20241031162543-6b96e5981a0d
 	github.com/coreos/go-oidc/v3 v3.11.0
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 	github.com/dustin/go-humanize v1.0.1
 	github.com/google/uuid v1.6.0
+	github.com/metal-toolbox/bmc-common v1.0.2
 	github.com/metal-toolbox/bomservice v0.1.6
 	github.com/metal-toolbox/conditionorc v1.12.1
 	github.com/metal-toolbox/fleetdb v1.20.1
@@ -87,7 +87,6 @@ require (
 	github.com/magiconair/properties v1.8.9 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/metal-toolbox/bmc-common v1.0.2 // indirect
 	github.com/metal-toolbox/rivets v1.3.10 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
diff --git a/go.sum b/go.sum
index cc4e3ce6..836e2f01 100644
--- a/go.sum
+++ b/go.sum
@@ -109,8 +109,6 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bmc-toolbox/common v0.0.0-20241031162543-6b96e5981a0d h1:dMmFDAAEpXizInaNwPSa5LM6tX/xDIPKjL6v9jYfMxo=
-github.com/bmc-toolbox/common v0.0.0-20241031162543-6b96e5981a0d/go.mod h1:Cdnkm+edb6C0pVkyCrwh3JTXAe0iUF9diDG/DztPI9I=
 github.com/bytedance/sonic v1.12.5 h1:hoZxY8uW+mT+OpkcUWw4k0fDINtOcVavEsGfzwzFU/w=
 github.com/bytedance/sonic v1.12.5/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
diff --git a/internal/fleetdb/types.go b/internal/fleetdb/types.go
index 893bf94b..92e93ae3 100644
--- a/internal/fleetdb/types.go
+++ b/internal/fleetdb/types.go
@@ -1,8 +1,8 @@
 package fleetdb
 
 import (
-	"github.com/bmc-toolbox/common"
 	"github.com/google/uuid"
+	common "github.com/metal-toolbox/bmc-common"
 )
 
 // FirmwareVersionedAttribute holds component firmware information.