diff --git a/Makefile b/Makefile
index df82f07c7..1fe2d42da 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 export GO111MODULE=on
 export DOCKER_BUILDKIT=1
 
-PROJECT := github.com/CanonicalLtd/jimm
+PROJECT := github.com/canonical/jimm
 
 GIT_COMMIT := $(shell git rev-parse --verify HEAD)
 GIT_VERSION := $(shell git describe --abbrev=0 --dirty)
diff --git a/README.md b/README.md
index 3ca2f6f31..b21d0085e 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ considered a work in progress.
 To start using JIMM, first ensure you have a valid Go environment,
 then run the following:
 
-    go get github.com/CanonicalLtd/jimm
+    go get github.com/canonical/jimm
 
 ## Go dependencies
 
diff --git a/api/jimm.go b/api/jimm.go
index 9fb46a776..70876806b 100644
--- a/api/jimm.go
+++ b/api/jimm.go
@@ -5,7 +5,7 @@ package api
 import (
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/api/params"
+	"github.com/canonical/jimm/api/params"
 )
 
 // An APICaller implements the interface required to make API calls.
diff --git a/cmd/jimmctl/cmd/addcloudtocontroller.go b/cmd/jimmctl/cmd/addcloudtocontroller.go
index 9b0dae85b..0e95b3a47 100644
--- a/cmd/jimmctl/cmd/addcloudtocontroller.go
+++ b/cmd/jimmctl/cmd/addcloudtocontroller.go
@@ -10,19 +10,19 @@ import (
 	"github.com/juju/gnuflag"
 	jujuapi "github.com/juju/juju/api"
 	"github.com/juju/juju/apiserver/common"
-	"github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/cloud"
 	jujucmd "github.com/juju/juju/cmd"
 	jujucmdcloud "github.com/juju/juju/cmd/juju/cloud"
 	jujucmdcommon "github.com/juju/juju/cmd/juju/common"
 	"github.com/juju/juju/cmd/modelcmd"
 	"github.com/juju/juju/jujuclient"
+	"github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 var (
diff --git a/cmd/jimmctl/cmd/addcloudtocontroller_test.go b/cmd/jimmctl/cmd/addcloudtocontroller_test.go
index ffdd48e28..d531c605a 100644
--- a/cmd/jimmctl/cmd/addcloudtocontroller_test.go
+++ b/cmd/jimmctl/cmd/addcloudtocontroller_test.go
@@ -12,9 +12,9 @@ import (
 
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 type addCloudToControllerSuite struct {
diff --git a/cmd/jimmctl/cmd/addcontroller.go b/cmd/jimmctl/cmd/addcontroller.go
index da3e1d837..3fab56adc 100644
--- a/cmd/jimmctl/cmd/addcontroller.go
+++ b/cmd/jimmctl/cmd/addcontroller.go
@@ -11,9 +11,9 @@ import (
 	"github.com/juju/juju/jujuclient"
 	"sigs.k8s.io/yaml"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 var (
diff --git a/cmd/jimmctl/cmd/addcontroller_test.go b/cmd/jimmctl/cmd/addcontroller_test.go
index 1ef0fa9dc..720d79a4e 100644
--- a/cmd/jimmctl/cmd/addcontroller_test.go
+++ b/cmd/jimmctl/cmd/addcontroller_test.go
@@ -11,9 +11,9 @@ import (
 	gc "gopkg.in/check.v1"
 	"sigs.k8s.io/yaml"
 
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type addControllerSuite struct {
diff --git a/cmd/jimmctl/cmd/controllerinfo.go b/cmd/jimmctl/cmd/controllerinfo.go
index 706643155..d422c50be 100644
--- a/cmd/jimmctl/cmd/controllerinfo.go
+++ b/cmd/jimmctl/cmd/controllerinfo.go
@@ -13,7 +13,7 @@ import (
 	"github.com/juju/juju/jujuclient"
 	"sigs.k8s.io/yaml"
 
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
+	apiparams "github.com/canonical/jimm/api/params"
 )
 
 var (
diff --git a/cmd/jimmctl/cmd/controllerinfo_test.go b/cmd/jimmctl/cmd/controllerinfo_test.go
index 37bf95590..b107f0283 100644
--- a/cmd/jimmctl/cmd/controllerinfo_test.go
+++ b/cmd/jimmctl/cmd/controllerinfo_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/juju/juju/jujuclient"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
 )
 
 type controllerInfoSuite struct {
diff --git a/cmd/jimmctl/cmd/grantauditlogaccess.go b/cmd/jimmctl/cmd/grantauditlogaccess.go
index 9d8c9ba64..e8e6f4988 100644
--- a/cmd/jimmctl/cmd/grantauditlogaccess.go
+++ b/cmd/jimmctl/cmd/grantauditlogaccess.go
@@ -11,9 +11,9 @@ import (
 	"github.com/juju/juju/jujuclient"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 var grantAuditLogAccessDoc = `
diff --git a/cmd/jimmctl/cmd/grantauditlogaccess_test.go b/cmd/jimmctl/cmd/grantauditlogaccess_test.go
index 49fb7475d..a67a84902 100644
--- a/cmd/jimmctl/cmd/grantauditlogaccess_test.go
+++ b/cmd/jimmctl/cmd/grantauditlogaccess_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/juju/cmd/v3/cmdtesting"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
 )
 
 type grantAuditLogAccessSuite struct {
diff --git a/cmd/jimmctl/cmd/importcloudcredentials.go b/cmd/jimmctl/cmd/importcloudcredentials.go
index db99d876b..fdb2fbc4e 100644
--- a/cmd/jimmctl/cmd/importcloudcredentials.go
+++ b/cmd/jimmctl/cmd/importcloudcredentials.go
@@ -14,7 +14,7 @@ import (
 	"github.com/juju/juju/jujuclient"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 const importCloudCredentialsDoc = `
diff --git a/cmd/jimmctl/cmd/importcloudcredentials_test.go b/cmd/jimmctl/cmd/importcloudcredentials_test.go
index 442c0e681..cc0e0b04d 100644
--- a/cmd/jimmctl/cmd/importcloudcredentials_test.go
+++ b/cmd/jimmctl/cmd/importcloudcredentials_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/juju/cmd/v3/cmdtesting"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 type importCloudCredentialsSuite struct {
diff --git a/cmd/jimmctl/cmd/importmodel.go b/cmd/jimmctl/cmd/importmodel.go
index 325f401c9..beb492e09 100644
--- a/cmd/jimmctl/cmd/importmodel.go
+++ b/cmd/jimmctl/cmd/importmodel.go
@@ -10,9 +10,9 @@ import (
 	"github.com/juju/juju/jujuclient"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 const importModelCommandDoc = `
diff --git a/cmd/jimmctl/cmd/importmodel_test.go b/cmd/jimmctl/cmd/importmodel_test.go
index 876d6a46f..63d866951 100644
--- a/cmd/jimmctl/cmd/importmodel_test.go
+++ b/cmd/jimmctl/cmd/importmodel_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/juju/names/v4"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type importModelSuite struct {
diff --git a/cmd/jimmctl/cmd/jimmsuite_test.go b/cmd/jimmctl/cmd/jimmsuite_test.go
index 5ab2aee3d..ee0cc1991 100644
--- a/cmd/jimmctl/cmd/jimmsuite_test.go
+++ b/cmd/jimmctl/cmd/jimmsuite_test.go
@@ -20,12 +20,12 @@ import (
 	"github.com/juju/names/v4"
 	gc "gopkg.in/check.v1"
 
-	service "github.com/CanonicalLtd/jimm"
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
-	"github.com/CanonicalLtd/jimm/internal/jujuclient"
+	service "github.com/canonical/jimm"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/jujuclient"
 )
 
 type gcTester struct {
diff --git a/cmd/jimmctl/cmd/listauditevents.go b/cmd/jimmctl/cmd/listauditevents.go
index 6cec9d591..b7fdb601c 100644
--- a/cmd/jimmctl/cmd/listauditevents.go
+++ b/cmd/jimmctl/cmd/listauditevents.go
@@ -15,9 +15,9 @@ import (
 	"github.com/juju/juju/cmd/modelcmd"
 	"github.com/juju/juju/jujuclient"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 var listAuditEventsCommandDoc = `
diff --git a/cmd/jimmctl/cmd/listauditevents_test.go b/cmd/jimmctl/cmd/listauditevents_test.go
index 937e4c33b..d273ad2c1 100644
--- a/cmd/jimmctl/cmd/listauditevents_test.go
+++ b/cmd/jimmctl/cmd/listauditevents_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/juju/names/v4"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type listAuditEventsSuite struct {
diff --git a/cmd/jimmctl/cmd/listcontrollers.go b/cmd/jimmctl/cmd/listcontrollers.go
index a77740f74..5c910157d 100644
--- a/cmd/jimmctl/cmd/listcontrollers.go
+++ b/cmd/jimmctl/cmd/listcontrollers.go
@@ -10,8 +10,8 @@ import (
 	"github.com/juju/juju/cmd/modelcmd"
 	"github.com/juju/juju/jujuclient"
 
-	"github.com/CanonicalLtd/jimm/api"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/api"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 var listControllersComandDoc = `
diff --git a/cmd/jimmctl/cmd/listcontrollers_test.go b/cmd/jimmctl/cmd/listcontrollers_test.go
index c660bbb22..b34fb87bf 100644
--- a/cmd/jimmctl/cmd/listcontrollers_test.go
+++ b/cmd/jimmctl/cmd/listcontrollers_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/juju/cmd/v3/cmdtesting"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 var (
diff --git a/cmd/jimmctl/cmd/modelstatus.go b/cmd/jimmctl/cmd/modelstatus.go
index 25e741475..6f434fb91 100644
--- a/cmd/jimmctl/cmd/modelstatus.go
+++ b/cmd/jimmctl/cmd/modelstatus.go
@@ -11,9 +11,9 @@ import (
 	"github.com/juju/juju/jujuclient"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 var modelStatusCommandDoc = `
diff --git a/cmd/jimmctl/cmd/modelstatus_test.go b/cmd/jimmctl/cmd/modelstatus_test.go
index 33cb3e077..6e3c4ab43 100644
--- a/cmd/jimmctl/cmd/modelstatus_test.go
+++ b/cmd/jimmctl/cmd/modelstatus_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/juju/names/v4"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 var (
diff --git a/cmd/jimmctl/cmd/removecloudfromcontroller.go b/cmd/jimmctl/cmd/removecloudfromcontroller.go
index 8f95707b8..76a316a47 100644
--- a/cmd/jimmctl/cmd/removecloudfromcontroller.go
+++ b/cmd/jimmctl/cmd/removecloudfromcontroller.go
@@ -13,10 +13,10 @@ import (
 	"github.com/juju/juju/jujuclient"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 var (
diff --git a/cmd/jimmctl/cmd/removecloudfromcontroller_test.go b/cmd/jimmctl/cmd/removecloudfromcontroller_test.go
index 21c6d5f5f..cdfb7139a 100644
--- a/cmd/jimmctl/cmd/removecloudfromcontroller_test.go
+++ b/cmd/jimmctl/cmd/removecloudfromcontroller_test.go
@@ -7,8 +7,8 @@ import (
 
 	gc "gopkg.in/check.v1"
 
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
 )
 
 type removeCloudFromControllerSuite struct {
diff --git a/cmd/jimmctl/cmd/removecontroller.go b/cmd/jimmctl/cmd/removecontroller.go
index 486601792..e6eba4a91 100644
--- a/cmd/jimmctl/cmd/removecontroller.go
+++ b/cmd/jimmctl/cmd/removecontroller.go
@@ -10,9 +10,9 @@ import (
 	"github.com/juju/juju/cmd/modelcmd"
 	"github.com/juju/juju/jujuclient"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 var (
diff --git a/cmd/jimmctl/cmd/removecontroller_test.go b/cmd/jimmctl/cmd/removecontroller_test.go
index c2ac8434e..518f2ab5e 100644
--- a/cmd/jimmctl/cmd/removecontroller_test.go
+++ b/cmd/jimmctl/cmd/removecontroller_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/juju/cmd/v3/cmdtesting"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type removeControllerSuite struct {
diff --git a/cmd/jimmctl/cmd/revokeauditlogaccess.go b/cmd/jimmctl/cmd/revokeauditlogaccess.go
index dc3df861a..b215105fa 100644
--- a/cmd/jimmctl/cmd/revokeauditlogaccess.go
+++ b/cmd/jimmctl/cmd/revokeauditlogaccess.go
@@ -11,9 +11,9 @@ import (
 	"github.com/juju/juju/jujuclient"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 var revokeAuditLogAccessDoc = `
diff --git a/cmd/jimmctl/cmd/revokeauditlogaccess_test.go b/cmd/jimmctl/cmd/revokeauditlogaccess_test.go
index 32ec786d7..f3cfdc0e3 100644
--- a/cmd/jimmctl/cmd/revokeauditlogaccess_test.go
+++ b/cmd/jimmctl/cmd/revokeauditlogaccess_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/juju/cmd/v3/cmdtesting"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
 )
 
 type revokeAuditLogAccessSuite struct {
diff --git a/cmd/jimmctl/cmd/setcontrollerdeprecated.go b/cmd/jimmctl/cmd/setcontrollerdeprecated.go
index f181f01c3..053e98c07 100644
--- a/cmd/jimmctl/cmd/setcontrollerdeprecated.go
+++ b/cmd/jimmctl/cmd/setcontrollerdeprecated.go
@@ -10,9 +10,9 @@ import (
 	"github.com/juju/juju/cmd/modelcmd"
 	"github.com/juju/juju/jujuclient"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 var setControllerDeprecatedDoc = `
diff --git a/cmd/jimmctl/cmd/setcontrollerdeprecated_test.go b/cmd/jimmctl/cmd/setcontrollerdeprecated_test.go
index cd0fec329..19b10f522 100644
--- a/cmd/jimmctl/cmd/setcontrollerdeprecated_test.go
+++ b/cmd/jimmctl/cmd/setcontrollerdeprecated_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/juju/cmd/v3/cmdtesting"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type setControllerDeprecatedSuite struct {
diff --git a/cmd/jimmctl/cmd/updatemigratedmodel.go b/cmd/jimmctl/cmd/updatemigratedmodel.go
index 11e8977b4..92fde9ee6 100644
--- a/cmd/jimmctl/cmd/updatemigratedmodel.go
+++ b/cmd/jimmctl/cmd/updatemigratedmodel.go
@@ -10,9 +10,9 @@ import (
 	"github.com/juju/juju/jujuclient"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 const updateMigratedModelCommandDoc = `
diff --git a/cmd/jimmctl/cmd/updatemigratedmodel_test.go b/cmd/jimmctl/cmd/updatemigratedmodel_test.go
index dcae2a4c3..67a10ecb1 100644
--- a/cmd/jimmctl/cmd/updatemigratedmodel_test.go
+++ b/cmd/jimmctl/cmd/updatemigratedmodel_test.go
@@ -10,9 +10,9 @@ import (
 	"github.com/juju/names/v4"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type updateMigratedModelSuite struct {
diff --git a/cmd/jimmctl/main.go b/cmd/jimmctl/main.go
index e4d87e06c..936339bd8 100644
--- a/cmd/jimmctl/main.go
+++ b/cmd/jimmctl/main.go
@@ -8,7 +8,7 @@ import (
 
 	jujucmd "github.com/juju/cmd/v3"
 
-	"github.com/CanonicalLtd/jimm/cmd/jimmctl/cmd"
+	"github.com/canonical/jimm/cmd/jimmctl/cmd"
 )
 
 var jimmctlDoc = `
diff --git a/cmd/jimmsrv/main.go b/cmd/jimmsrv/main.go
index c5f2d3054..39b0e43de 100644
--- a/cmd/jimmsrv/main.go
+++ b/cmd/jimmsrv/main.go
@@ -14,8 +14,8 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	"github.com/CanonicalLtd/jimm"
-	"github.com/CanonicalLtd/jimm/version"
+	"github.com/canonical/jimm"
+	"github.com/canonical/jimm/version"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
index 056032ecd..f5251e5aa 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/CanonicalLtd/jimm
+module github.com/canonical/jimm
 
 go 1.18
 
diff --git a/internal/auth/client.go b/internal/auth/client.go
index fcdc79ed4..4d86818df 100644
--- a/internal/auth/client.go
+++ b/internal/auth/client.go
@@ -1,4 +1,4 @@
-// Copyright 2021 CanonicalLtd.
+// Copyright 2021 canonical.
 
 package auth
 
diff --git a/internal/auth/jujuauth.go b/internal/auth/jujuauth.go
index 777887e76..515971b5e 100644
--- a/internal/auth/jujuauth.go
+++ b/internal/auth/jujuauth.go
@@ -1,4 +1,4 @@
-// Copyright 2021 CanonicalLtd.
+// Copyright 2021 canonical.
 
 package auth
 
@@ -11,9 +11,9 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/servermon"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/servermon"
 )
 
 // Everyone is the juju username that represents all users.
diff --git a/internal/auth/jujuauth_test.go b/internal/auth/jujuauth_test.go
index aff4013b7..251349692 100644
--- a/internal/auth/jujuauth_test.go
+++ b/internal/auth/jujuauth_test.go
@@ -1,4 +1,4 @@
-// Copyright 2021 CanonicalLtd.
+// Copyright 2021 canonical.
 
 package auth_test
 
@@ -16,9 +16,9 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"gopkg.in/macaroon.v2"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 func TestAuthenticateLogin(t *testing.T) {
diff --git a/internal/cloudcred/cloudcred_test.go b/internal/cloudcred/cloudcred_test.go
index a3b8ad3f7..c6118c23c 100644
--- a/internal/cloudcred/cloudcred_test.go
+++ b/internal/cloudcred/cloudcred_test.go
@@ -5,7 +5,7 @@ package cloudcred_test
 import (
 	"testing"
 
-	"github.com/CanonicalLtd/jimm/internal/cloudcred"
+	"github.com/canonical/jimm/internal/cloudcred"
 	qt "github.com/frankban/quicktest"
 )
 
diff --git a/internal/dashboard/dashboard_test.go b/internal/dashboard/dashboard_test.go
index a5e6a599f..d98417c34 100644
--- a/internal/dashboard/dashboard_test.go
+++ b/internal/dashboard/dashboard_test.go
@@ -12,7 +12,7 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/CanonicalLtd/jimm/internal/dashboard"
+	"github.com/canonical/jimm/internal/dashboard"
 )
 
 const (
diff --git a/internal/db/applicationoffer.go b/internal/db/applicationoffer.go
index fd2b89973..1bfac32fe 100644
--- a/internal/db/applicationoffer.go
+++ b/internal/db/applicationoffer.go
@@ -7,8 +7,8 @@ import (
 
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // AddApplicationOffer stores the application offer information.
diff --git a/internal/db/applicationoffer_test.go b/internal/db/applicationoffer_test.go
index 3ebe8e3a3..8770701ec 100644
--- a/internal/db/applicationoffer_test.go
+++ b/internal/db/applicationoffer_test.go
@@ -11,9 +11,9 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/google/go-cmp/cmp/cmpopts"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 func TestAddApplicationOfferUnconfiguredDatabase(t *testing.T) {
diff --git a/internal/db/audit.go b/internal/db/audit.go
index ded24b32d..9ab1effcf 100644
--- a/internal/db/audit.go
+++ b/internal/db/audit.go
@@ -6,8 +6,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // AddAuditLogEntry adds a new entry to the audit log.
diff --git a/internal/db/auditlog_test.go b/internal/db/auditlog_test.go
index 810443eea..81b4ffedb 100644
--- a/internal/db/auditlog_test.go
+++ b/internal/db/auditlog_test.go
@@ -10,9 +10,9 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 func TestAddAuditLogEntryUnconfiguredDatabase(t *testing.T) {
diff --git a/internal/db/cloud.go b/internal/db/cloud.go
index a8b1e7c57..72050b832 100644
--- a/internal/db/cloud.go
+++ b/internal/db/cloud.go
@@ -8,8 +8,8 @@ import (
 
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // AddCloud adds the given cloud to the database. AddCloud returns an error
diff --git a/internal/db/cloud_test.go b/internal/db/cloud_test.go
index dfee025cb..a396d2a09 100644
--- a/internal/db/cloud_test.go
+++ b/internal/db/cloud_test.go
@@ -10,11 +10,11 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestAddCloudUnconfiguredDatabase(t *testing.T) {
diff --git a/internal/db/cloudcredential.go b/internal/db/cloudcredential.go
index 5360c9ed0..2abc4213a 100644
--- a/internal/db/cloudcredential.go
+++ b/internal/db/cloudcredential.go
@@ -8,8 +8,8 @@ import (
 
 	"gorm.io/gorm/clause"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // SetCloudCredential upserts the cloud credential information.
diff --git a/internal/db/cloudcredential_test.go b/internal/db/cloudcredential_test.go
index 29f6c97c0..98434a335 100644
--- a/internal/db/cloudcredential_test.go
+++ b/internal/db/cloudcredential_test.go
@@ -11,10 +11,10 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestSetCloudCredentialUnconfiguredDatabase(t *testing.T) {
diff --git a/internal/db/clouddefaults.go b/internal/db/clouddefaults.go
index f127320ec..eb31bf026 100644
--- a/internal/db/clouddefaults.go
+++ b/internal/db/clouddefaults.go
@@ -8,8 +8,8 @@ import (
 	"github.com/juju/names/v4"
 	"gorm.io/gorm/clause"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // SetCloudDefaults sets default model setting values for the specified cloud/region.
diff --git a/internal/db/clouddefaults_test.go b/internal/db/clouddefaults_test.go
index d132f6d57..eac5058ee 100644
--- a/internal/db/clouddefaults_test.go
+++ b/internal/db/clouddefaults_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/juju/names/v4"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 func (s *dbSuite) TestModelDefaults(c *qt.C) {
diff --git a/internal/db/controller.go b/internal/db/controller.go
index 2dd5e41f1..8e0b0b375 100644
--- a/internal/db/controller.go
+++ b/internal/db/controller.go
@@ -5,8 +5,8 @@ package db
 import (
 	"context"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 	"gorm.io/gorm/clause"
 )
 
diff --git a/internal/db/controller_test.go b/internal/db/controller_test.go
index cadaa1110..2ca398b3e 100644
--- a/internal/db/controller_test.go
+++ b/internal/db/controller_test.go
@@ -12,10 +12,10 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestAddControllerUnconfiguredDatabase(t *testing.T) {
diff --git a/internal/db/db.go b/internal/db/db.go
index 98ec83472..76eaadf4b 100644
--- a/internal/db/db.go
+++ b/internal/db/db.go
@@ -13,8 +13,8 @@ import (
 
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // A Database provides access to the database model. A Database instance
diff --git a/internal/db/db_test.go b/internal/db/db_test.go
index f23182f1d..9d6777b78 100644
--- a/internal/db/db_test.go
+++ b/internal/db/db_test.go
@@ -8,9 +8,9 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // dbSuite contains a suite of database tests that are run against
diff --git a/internal/db/dqlite_test.go b/internal/db/dqlite_test.go
index eb6d6ad53..ec1668b36 100644
--- a/internal/db/dqlite_test.go
+++ b/internal/db/dqlite_test.go
@@ -17,8 +17,8 @@ import (
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestDQLite(t *testing.T) {
diff --git a/internal/db/errors.go b/internal/db/errors.go
index da784e940..db983fd34 100644
--- a/internal/db/errors.go
+++ b/internal/db/errors.go
@@ -8,7 +8,7 @@ import (
 	sqlite3 "github.com/mattn/go-sqlite3"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // postgresql error codes from
diff --git a/internal/db/model.go b/internal/db/model.go
index d045f85c6..a644a3de4 100644
--- a/internal/db/model.go
+++ b/internal/db/model.go
@@ -7,13 +7,13 @@ import (
 
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // AddModel stores the model information.
-// - returns an error with code errors.CodeAlreadyExists if
-//   model with the same name already exists.
+//   - returns an error with code errors.CodeAlreadyExists if
+//     model with the same name already exists.
 func (d *Database) AddModel(ctx context.Context, model *dbmodel.Model) error {
 	const op = errors.Op("db.AddModel")
 	if err := d.ready(); err != nil {
diff --git a/internal/db/model_test.go b/internal/db/model_test.go
index f575a2cb7..bcda1c40f 100644
--- a/internal/db/model_test.go
+++ b/internal/db/model_test.go
@@ -10,10 +10,10 @@ import (
 	qt "github.com/frankban/quicktest"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestAddModelUnconfiguredDatabase(t *testing.T) {
diff --git a/internal/db/pgx_test.go b/internal/db/pgx_test.go
index c053acee1..b697483d8 100644
--- a/internal/db/pgx_test.go
+++ b/internal/db/pgx_test.go
@@ -18,8 +18,8 @@ import (
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestPostgres(t *testing.T) {
diff --git a/internal/db/rootkeys.go b/internal/db/rootkeys.go
index 9de691217..c5b4dab45 100644
--- a/internal/db/rootkeys.go
+++ b/internal/db/rootkeys.go
@@ -9,8 +9,8 @@ import (
 	"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery/dbrootkeystore"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // GetKey implements Backing.GetKey.
diff --git a/internal/db/rootkeys_test.go b/internal/db/rootkeys_test.go
index e95263cfd..34e48f0e5 100644
--- a/internal/db/rootkeys_test.go
+++ b/internal/db/rootkeys_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery"
 	"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery/dbrootkeystore"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 var _ dbrootkeystore.Backing = (*db.Database)(nil)
diff --git a/internal/db/sqlite_test.go b/internal/db/sqlite_test.go
index d38622c93..8fb147d8a 100644
--- a/internal/db/sqlite_test.go
+++ b/internal/db/sqlite_test.go
@@ -8,8 +8,8 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/frankban/quicktest/qtsuite"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestSQLite(t *testing.T) {
diff --git a/internal/db/user.go b/internal/db/user.go
index e1a7ede0d..00138f9a0 100644
--- a/internal/db/user.go
+++ b/internal/db/user.go
@@ -5,8 +5,8 @@ package db
 import (
 	"context"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // GetUser loads the user details for the user identified by username. If
diff --git a/internal/db/user_test.go b/internal/db/user_test.go
index 3e798a651..d5aaad3f7 100644
--- a/internal/db/user_test.go
+++ b/internal/db/user_test.go
@@ -11,11 +11,11 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestGetUserUnconfiguredDatabase(t *testing.T) {
diff --git a/internal/db/usermodeldefaults.go b/internal/db/usermodeldefaults.go
index e5f9861a9..67fd81e73 100644
--- a/internal/db/usermodeldefaults.go
+++ b/internal/db/usermodeldefaults.go
@@ -7,8 +7,8 @@ import (
 
 	"gorm.io/gorm/clause"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // SetUserModelDefaults sets default model setting values for the controller.
diff --git a/internal/db/usermodeldefaults_test.go b/internal/db/usermodeldefaults_test.go
index a134c01e7..248fa79e2 100644
--- a/internal/db/usermodeldefaults_test.go
+++ b/internal/db/usermodeldefaults_test.go
@@ -11,10 +11,10 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestSetUserModelDefaults(t *testing.T) {
diff --git a/internal/dbmodel/applicationoffer_test.go b/internal/dbmodel/applicationoffer_test.go
index 7e59be0e4..1586f0a55 100644
--- a/internal/dbmodel/applicationoffer_test.go
+++ b/internal/dbmodel/applicationoffer_test.go
@@ -8,7 +8,7 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 func TestApplicationOfferTag(t *testing.T) {
diff --git a/internal/dbmodel/audit.go b/internal/dbmodel/audit.go
index 04fd10f8c..73b0aff2a 100644
--- a/internal/dbmodel/audit.go
+++ b/internal/dbmodel/audit.go
@@ -7,7 +7,7 @@ import (
 
 	"gorm.io/gorm"
 
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
+	apiparams "github.com/canonical/jimm/api/params"
 )
 
 // An AuditLogEntry is an entry in the audit log.
diff --git a/internal/dbmodel/audit_test.go b/internal/dbmodel/audit_test.go
index 8e93c4c74..733fd199e 100644
--- a/internal/dbmodel/audit_test.go
+++ b/internal/dbmodel/audit_test.go
@@ -9,8 +9,8 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/juju/names/v4"
 
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 func TestAuditLogEntry(t *testing.T) {
diff --git a/internal/dbmodel/cloud_test.go b/internal/dbmodel/cloud_test.go
index d805001d2..d247790b9 100644
--- a/internal/dbmodel/cloud_test.go
+++ b/internal/dbmodel/cloud_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/juju/names/v4"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 func TestCloudTag(t *testing.T) {
diff --git a/internal/dbmodel/cloudcredential_test.go b/internal/dbmodel/cloudcredential_test.go
index 83c594ad7..6f784e997 100644
--- a/internal/dbmodel/cloudcredential_test.go
+++ b/internal/dbmodel/cloudcredential_test.go
@@ -8,7 +8,7 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 func TestCloudCredentialTag(t *testing.T) {
diff --git a/internal/dbmodel/controller.go b/internal/dbmodel/controller.go
index 54f9d2f73..c17ddbea4 100644
--- a/internal/dbmodel/controller.go
+++ b/internal/dbmodel/controller.go
@@ -11,7 +11,7 @@ import (
 	"github.com/juju/names/v4"
 	"gorm.io/gorm"
 
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
+	apiparams "github.com/canonical/jimm/api/params"
 )
 
 // A controller represents a juju controller which is hosting models
diff --git a/internal/dbmodel/controller_test.go b/internal/dbmodel/controller_test.go
index fabe413c4..9ca0cae6f 100644
--- a/internal/dbmodel/controller_test.go
+++ b/internal/dbmodel/controller_test.go
@@ -6,8 +6,8 @@ import (
 	"database/sql"
 	"testing"
 
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/dbmodel"
 	qt "github.com/frankban/quicktest"
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
diff --git a/internal/dbmodel/gorm_test.go b/internal/dbmodel/gorm_test.go
index 546c31f41..3b07fb247 100644
--- a/internal/dbmodel/gorm_test.go
+++ b/internal/dbmodel/gorm_test.go
@@ -7,8 +7,8 @@ import (
 
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 // gormDB creates a new *gorm.DB for use in tests. The newly created DB
diff --git a/internal/dbmodel/model.go b/internal/dbmodel/model.go
index c8753dfcc..40ef720e0 100644
--- a/internal/dbmodel/model.go
+++ b/internal/dbmodel/model.go
@@ -6,14 +6,14 @@ import (
 	"database/sql"
 	"time"
 
-	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/core/life"
 	"github.com/juju/juju/core/status"
+	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 	"github.com/juju/version/v2"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // A Model is a juju model.
diff --git a/internal/dbmodel/model_test.go b/internal/dbmodel/model_test.go
index 31db85bc6..9bb7cd758 100644
--- a/internal/dbmodel/model_test.go
+++ b/internal/dbmodel/model_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/juju/names/v4"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 func TestModelTag(t *testing.T) {
diff --git a/internal/dbmodel/types_test.go b/internal/dbmodel/types_test.go
index d7f17b571..3d8005d70 100644
--- a/internal/dbmodel/types_test.go
+++ b/internal/dbmodel/types_test.go
@@ -8,7 +8,7 @@ import (
 	qt "github.com/frankban/quicktest"
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 func TestStringsGormDataType(t *testing.T) {
diff --git a/internal/dbmodel/user_test.go b/internal/dbmodel/user_test.go
index 5207eb021..80fb90208 100644
--- a/internal/dbmodel/user_test.go
+++ b/internal/dbmodel/user_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/juju/names/v4"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 func TestUser(t *testing.T) {
diff --git a/internal/dbmodel/version_test.go b/internal/dbmodel/version_test.go
index d8b21159c..9b3d28815 100644
--- a/internal/dbmodel/version_test.go
+++ b/internal/dbmodel/version_test.go
@@ -8,7 +8,7 @@ import (
 	qt "github.com/frankban/quicktest"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 func TestVersion(t *testing.T) {
diff --git a/internal/debugapi/api.go b/internal/debugapi/api.go
index 81416e963..95d42b033 100644
--- a/internal/debugapi/api.go
+++ b/internal/debugapi/api.go
@@ -10,7 +10,7 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	"github.com/CanonicalLtd/jimm/version"
+	"github.com/canonical/jimm/version"
 )
 
 // Handler returns an http.Handler to handle requests for /debug endpoints.
diff --git a/internal/debugapi/api_test.go b/internal/debugapi/api_test.go
index 20ff8692b..6e8ad9003 100644
--- a/internal/debugapi/api_test.go
+++ b/internal/debugapi/api_test.go
@@ -11,9 +11,9 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/CanonicalLtd/jimm/internal/debugapi"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/version"
+	"github.com/canonical/jimm/internal/debugapi"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/version"
 )
 
 func TestDebugInfo(t *testing.T) {
diff --git a/internal/errors/errors.go b/internal/errors/errors.go
index 8f3d7f923..046b7916e 100644
--- a/internal/errors/errors.go
+++ b/internal/errors/errors.go
@@ -10,7 +10,7 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
+	apiparams "github.com/canonical/jimm/api/params"
 )
 
 // An Error is an error in the JIMM system.
@@ -56,11 +56,11 @@ func (e *Error) ErrorCode() string {
 // is constructed by processing the given arguments. The meaning of the
 // arguments is as follows:
 //
-//     errors.Op   - string representation of the operation being
-//                   performed.
-//     errors.Code - string code classifying the error.
-//     error       - underlying error that caused the new error.
-//     string      - A human readable message describing the error.
+//	errors.Op   - string representation of the operation being
+//	              performed.
+//	errors.Code - string code classifying the error.
+//	error       - underlying error that caused the new error.
+//	string      - A human readable message describing the error.
 //
 // E will panic if no arguments are provided.
 func E(args ...interface{}) error {
diff --git a/internal/errors/errors_test.go b/internal/errors/errors_test.go
index f7bcef71d..ada450d0d 100644
--- a/internal/errors/errors_test.go
+++ b/internal/errors/errors_test.go
@@ -7,7 +7,7 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 func TestEEmptyArguments(t *testing.T) {
diff --git a/internal/jimm/applicationoffer.go b/internal/jimm/applicationoffer.go
index 016a75fd4..4a5edd525 100644
--- a/internal/jimm/applicationoffer.go
+++ b/internal/jimm/applicationoffer.go
@@ -11,16 +11,16 @@ import (
 	"time"
 
 	"github.com/go-macaroon-bakery/macaroon-bakery/v3/bakery"
-	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/core/crossmodel"
+	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 	"github.com/juju/zaputil"
 	"github.com/juju/zaputil/zapctx"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // AddApplicationOfferParams holds parameters for the Offer method.
diff --git a/internal/jimm/applicationoffer_test.go b/internal/jimm/applicationoffer_test.go
index 2380b1529..a3e6754c5 100644
--- a/internal/jimm/applicationoffer_test.go
+++ b/internal/jimm/applicationoffer_test.go
@@ -18,11 +18,11 @@ import (
 	"gopkg.in/macaroon.v2"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type environment struct {
diff --git a/internal/jimm/cache.go b/internal/jimm/cache.go
index cb17ea116..6b57d1676 100644
--- a/internal/jimm/cache.go
+++ b/internal/jimm/cache.go
@@ -12,7 +12,7 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/sync/singleflight"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 // CacheDialer wraps the given Dialer in a cache that will share controller
diff --git a/internal/jimm/cache_test.go b/internal/jimm/cache_test.go
index 7f58c1522..10ba9d604 100644
--- a/internal/jimm/cache_test.go
+++ b/internal/jimm/cache_test.go
@@ -12,10 +12,10 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestCacheDialerDialError(t *testing.T) {
diff --git a/internal/jimm/cloud.go b/internal/jimm/cloud.go
index 1159b05d9..b0d053a52 100644
--- a/internal/jimm/cloud.go
+++ b/internal/jimm/cloud.go
@@ -13,10 +13,10 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // GetCloud retrieves the cloud for the given cloud tag. If the cloud
diff --git a/internal/jimm/cloud_test.go b/internal/jimm/cloud_test.go
index 2f871fa5b..46c20813a 100644
--- a/internal/jimm/cloud_test.go
+++ b/internal/jimm/cloud_test.go
@@ -12,12 +12,12 @@ import (
 	"github.com/juju/names/v4"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestGetCloud(t *testing.T) {
diff --git a/internal/jimm/cloudcredential.go b/internal/jimm/cloudcredential.go
index 50df37362..513d7d296 100644
--- a/internal/jimm/cloudcredential.go
+++ b/internal/jimm/cloudcredential.go
@@ -14,9 +14,9 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/cloudcred"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/cloudcred"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // GetCloudCredential retrieves the given credential from the database. The
diff --git a/internal/jimm/cloudcredential_test.go b/internal/jimm/cloudcredential_test.go
index 7e95dcab7..651b038d0 100644
--- a/internal/jimm/cloudcredential_test.go
+++ b/internal/jimm/cloudcredential_test.go
@@ -10,16 +10,16 @@ import (
 	"time"
 
 	qt "github.com/frankban/quicktest"
-	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/core/life"
 	"github.com/juju/juju/core/status"
+	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestUpdateCloudCredential(t *testing.T) {
diff --git a/internal/jimm/clouddefaults.go b/internal/jimm/clouddefaults.go
index f9799a1b0..4ad85f2dc 100644
--- a/internal/jimm/clouddefaults.go
+++ b/internal/jimm/clouddefaults.go
@@ -8,8 +8,8 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 const (
diff --git a/internal/jimm/clouddefaults_test.go b/internal/jimm/clouddefaults_test.go
index 1e8be4eb9..7aa790e29 100644
--- a/internal/jimm/clouddefaults_test.go
+++ b/internal/jimm/clouddefaults_test.go
@@ -13,10 +13,10 @@ import (
 	"github.com/juju/names/v4"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestSetCloudDefaults(t *testing.T) {
diff --git a/internal/jimm/controller.go b/internal/jimm/controller.go
index d3581c8f6..554efd005 100644
--- a/internal/jimm/controller.go
+++ b/internal/jimm/controller.go
@@ -16,10 +16,10 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // AddController adds the specified controller to JIMM. Only
diff --git a/internal/jimm/controller_test.go b/internal/jimm/controller_test.go
index 9caf0eb81..d5ee364d6 100644
--- a/internal/jimm/controller_test.go
+++ b/internal/jimm/controller_test.go
@@ -16,12 +16,12 @@ import (
 	"github.com/juju/names/v4"
 	semversion "github.com/juju/version"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
-	"github.com/CanonicalLtd/jimm/internal/vault"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/vault"
 )
 
 func TestAddController(t *testing.T) {
diff --git a/internal/jimm/export_test.go b/internal/jimm/export_test.go
index cf15e4f4d..f341d2f97 100644
--- a/internal/jimm/export_test.go
+++ b/internal/jimm/export_test.go
@@ -5,8 +5,8 @@ package jimm
 import (
 	"context"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 var (
diff --git a/internal/jimm/jimm.go b/internal/jimm/jimm.go
index 4481e5ee5..93c36898a 100644
--- a/internal/jimm/jimm.go
+++ b/internal/jimm/jimm.go
@@ -17,10 +17,10 @@ import (
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/pubsub"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/pubsub"
 )
 
 // A CredentialStore is a store for the attributes of a
diff --git a/internal/jimm/jimm_test.go b/internal/jimm/jimm_test.go
index e91decf94..6e9c45eaf 100644
--- a/internal/jimm/jimm_test.go
+++ b/internal/jimm/jimm_test.go
@@ -14,10 +14,10 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestFindAuditEvents(t *testing.T) {
diff --git a/internal/jimm/model.go b/internal/jimm/model.go
index 607a725df..16a1ad2ef 100644
--- a/internal/jimm/model.go
+++ b/internal/jimm/model.go
@@ -17,8 +17,8 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // shuffle is used to randomize the order in which possible controllers
diff --git a/internal/jimm/model_status_parser.go b/internal/jimm/model_status_parser.go
index 964c2906c..de9eaeb5a 100644
--- a/internal/jimm/model_status_parser.go
+++ b/internal/jimm/model_status_parser.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 	"github.com/itchyny/gojq"
 	"go.uber.org/zap"
 
diff --git a/internal/jimm/model_status_parser_test.go b/internal/jimm/model_status_parser_test.go
index f9b1448c2..691404b6e 100644
--- a/internal/jimm/model_status_parser_test.go
+++ b/internal/jimm/model_status_parser_test.go
@@ -11,11 +11,11 @@ import (
 	"github.com/juju/juju/core/status"
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 var now = (time.Time{}).UTC().Round(time.Millisecond)
diff --git a/internal/jimm/model_test.go b/internal/jimm/model_test.go
index d17e39521..41c559b5e 100644
--- a/internal/jimm/model_test.go
+++ b/internal/jimm/model_test.go
@@ -17,11 +17,11 @@ import (
 	"github.com/juju/version/v2"
 	"sigs.k8s.io/yaml"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestModelCreateArgs(t *testing.T) {
diff --git a/internal/jimm/modelsummary.go b/internal/jimm/modelsummary.go
index 4906d3a1e..0582531d5 100644
--- a/internal/jimm/modelsummary.go
+++ b/internal/jimm/modelsummary.go
@@ -11,9 +11,9 @@ import (
 	"github.com/juju/zaputil"
 	"github.com/juju/zaputil/zapctx"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/pubsub"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/pubsub"
 )
 
 var (
diff --git a/internal/jimm/modelsummary_test.go b/internal/jimm/modelsummary_test.go
index 07a894c74..3d95fd98c 100644
--- a/internal/jimm/modelsummary_test.go
+++ b/internal/jimm/modelsummary_test.go
@@ -10,12 +10,12 @@ import (
 	qt "github.com/frankban/quicktest"
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
-	"github.com/CanonicalLtd/jimm/internal/pubsub"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/pubsub"
 )
 
 func TestWatchAllModelSummaries(t *testing.T) {
diff --git a/internal/jimm/user.go b/internal/jimm/user.go
index 60e905938..a73ff643f 100644
--- a/internal/jimm/user.go
+++ b/internal/jimm/user.go
@@ -8,9 +8,9 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // Authenticate processes the given LoginRequest using the configured
diff --git a/internal/jimm/user_test.go b/internal/jimm/user_test.go
index 6c3f8c381..d685ecc16 100644
--- a/internal/jimm/user_test.go
+++ b/internal/jimm/user_test.go
@@ -12,11 +12,11 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestAuthenticateNoAuthenticator(t *testing.T) {
diff --git a/internal/jimm/usermodeldefaults.go b/internal/jimm/usermodeldefaults.go
index 84260926c..acd334307 100644
--- a/internal/jimm/usermodeldefaults.go
+++ b/internal/jimm/usermodeldefaults.go
@@ -5,8 +5,8 @@ package jimm
 import (
 	"context"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // SetUserModelDefaults writes new default model setting values for the user.
diff --git a/internal/jimm/usermodeldefaults_test.go b/internal/jimm/usermodeldefaults_test.go
index 1c8a862ab..cfdec9be0 100644
--- a/internal/jimm/usermodeldefaults_test.go
+++ b/internal/jimm/usermodeldefaults_test.go
@@ -11,10 +11,10 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 func TestSetUserModelDefaults(t *testing.T) {
diff --git a/internal/jimm/watcher.go b/internal/jimm/watcher.go
index a048295d4..75d3a18ee 100644
--- a/internal/jimm/watcher.go
+++ b/internal/jimm/watcher.go
@@ -13,9 +13,9 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // Publisher defines the interface used by the Watcher
diff --git a/internal/jimm/watcher_test.go b/internal/jimm/watcher_test.go
index cb3dba244..5b58322f1 100644
--- a/internal/jimm/watcher_test.go
+++ b/internal/jimm/watcher_test.go
@@ -15,11 +15,11 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 const testWatcherEnv = `clouds:
diff --git a/internal/jimmhttp/http_test.go b/internal/jimmhttp/http_test.go
index ee09c826d..f514b8db4 100644
--- a/internal/jimmhttp/http_test.go
+++ b/internal/jimmhttp/http_test.go
@@ -9,7 +9,7 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/CanonicalLtd/jimm/internal/jimmhttp"
+	"github.com/canonical/jimm/internal/jimmhttp"
 )
 
 var stripPathElementTests = []struct {
diff --git a/internal/jimmhttp/websocket.go b/internal/jimmhttp/websocket.go
index e9e649352..6f99ee8d2 100644
--- a/internal/jimmhttp/websocket.go
+++ b/internal/jimmhttp/websocket.go
@@ -12,7 +12,7 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	"github.com/CanonicalLtd/jimm/internal/servermon"
+	"github.com/canonical/jimm/internal/servermon"
 )
 
 // A WSHandler is an http.Handler that upgrades the connection to a
diff --git a/internal/jimmhttp/websocket_test.go b/internal/jimmhttp/websocket_test.go
index 2af12b89c..8542d2483 100644
--- a/internal/jimmhttp/websocket_test.go
+++ b/internal/jimmhttp/websocket_test.go
@@ -12,7 +12,7 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/gorilla/websocket"
 
-	"github.com/CanonicalLtd/jimm/internal/jimmhttp"
+	"github.com/canonical/jimm/internal/jimmhttp"
 )
 
 func TestWSHandler(t *testing.T) {
diff --git a/internal/jimmtest/api.go b/internal/jimmtest/api.go
index fb4eb33cc..8ca1def19 100644
--- a/internal/jimmtest/api.go
+++ b/internal/jimmtest/api.go
@@ -14,9 +14,9 @@ import (
 	"github.com/juju/juju/version"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
 )
 
 // DefaultControllerUUID is the controller UUID returned by Dialer if
diff --git a/internal/jimmtest/auth.go b/internal/jimmtest/auth.go
index aaeb4c3a7..2b591c9d7 100644
--- a/internal/jimmtest/auth.go
+++ b/internal/jimmtest/auth.go
@@ -7,7 +7,7 @@ import (
 
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 // An Authenticator is an implementation of jimm.Authenticator that returns
diff --git a/internal/jimmtest/cmp.go b/internal/jimmtest/cmp.go
index f789eada9..9f0fa73c1 100644
--- a/internal/jimmtest/cmp.go
+++ b/internal/jimmtest/cmp.go
@@ -9,7 +9,7 @@ import (
 	gc "gopkg.in/check.v1"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 // CloudTagComparer is a function that can be used with gocmp.Compare
diff --git a/internal/jimmtest/env.go b/internal/jimmtest/env.go
index 0f99ef869..d038e2819 100644
--- a/internal/jimmtest/env.go
+++ b/internal/jimmtest/env.go
@@ -13,8 +13,8 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"sigs.k8s.io/yaml"
 
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 const (
diff --git a/internal/jimmtest/suite.go b/internal/jimmtest/suite.go
index 1945bd723..6e097615a 100644
--- a/internal/jimmtest/suite.go
+++ b/internal/jimmtest/suite.go
@@ -16,12 +16,12 @@ import (
 	"github.com/juju/names/v4"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jujuclient"
-	"github.com/CanonicalLtd/jimm/internal/pubsub"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jujuclient"
+	"github.com/canonical/jimm/internal/pubsub"
 )
 
 // ControllerUUID is the UUID of the JIMM controller used in tests.
diff --git a/internal/jimmtest/vault.go b/internal/jimmtest/vault.go
index b87acc946..5d83597be 100644
--- a/internal/jimmtest/vault.go
+++ b/internal/jimmtest/vault.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/hashicorp/vault/api"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // VaultAuthPath contains the path that is configured automatically to
diff --git a/internal/jujuapi/admin.go b/internal/jujuapi/admin.go
index c9eaa6749..411105d15 100644
--- a/internal/jujuapi/admin.go
+++ b/internal/jujuapi/admin.go
@@ -11,9 +11,9 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/servermon"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/servermon"
 )
 
 // unsupportedLogin returns an appropriate error for login attempts using
diff --git a/internal/jujuapi/api.go b/internal/jujuapi/api.go
index d8890aad0..bd7f93573 100644
--- a/internal/jujuapi/api.go
+++ b/internal/jujuapi/api.go
@@ -7,8 +7,8 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmhttp"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmhttp"
 )
 
 // A Params object holds the paramaters needed to configure the API
diff --git a/internal/jujuapi/api_test.go b/internal/jujuapi/api_test.go
index b78dd039f..c56793aa3 100644
--- a/internal/jujuapi/api_test.go
+++ b/internal/jujuapi/api_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/juju/juju/rpc/jsoncodec"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi"
+	"github.com/canonical/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/jujuapi"
 )
 
 type apiSuite struct {
diff --git a/internal/jujuapi/applicationoffers.go b/internal/jujuapi/applicationoffers.go
index 5c279ea9a..2e28ad236 100644
--- a/internal/jujuapi/applicationoffers.go
+++ b/internal/jujuapi/applicationoffers.go
@@ -11,10 +11,10 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi/rpc"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jujuapi/rpc"
 )
 
 func init() {
diff --git a/internal/jujuapi/applicationoffers_test.go b/internal/jujuapi/applicationoffers_test.go
index 8c141d384..8d08b3bee 100644
--- a/internal/jujuapi/applicationoffers_test.go
+++ b/internal/jujuapi/applicationoffers_test.go
@@ -13,8 +13,8 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/dbmodel"
 )
 
 type applicationOffersSuite struct {
diff --git a/internal/jujuapi/cloud.go b/internal/jujuapi/cloud.go
index bf3da20fd..986b00839 100644
--- a/internal/jujuapi/cloud.go
+++ b/internal/jujuapi/cloud.go
@@ -11,10 +11,10 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi/rpc"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jujuapi/rpc"
 )
 
 func init() {
diff --git a/internal/jujuapi/cloud_test.go b/internal/jujuapi/cloud_test.go
index 4715a5f43..d07b4a570 100644
--- a/internal/jujuapi/cloud_test.go
+++ b/internal/jujuapi/cloud_test.go
@@ -14,7 +14,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type cloudSuite struct {
diff --git a/internal/jujuapi/controller.go b/internal/jujuapi/controller.go
index 91857fb8f..bbb7d981a 100644
--- a/internal/jujuapi/controller.go
+++ b/internal/jujuapi/controller.go
@@ -9,10 +9,10 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi/rpc"
-	jimmversion "github.com/CanonicalLtd/jimm/version"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jujuapi/rpc"
+	jimmversion "github.com/canonical/jimm/version"
 )
 
 func init() {
diff --git a/internal/jujuapi/controller_test.go b/internal/jujuapi/controller_test.go
index 01e88d0f5..063687e9a 100644
--- a/internal/jujuapi/controller_test.go
+++ b/internal/jujuapi/controller_test.go
@@ -16,8 +16,8 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/pubsub"
-	jimmversion "github.com/CanonicalLtd/jimm/version"
+	"github.com/canonical/jimm/internal/pubsub"
+	jimmversion "github.com/canonical/jimm/version"
 )
 
 type controllerSuite struct {
diff --git a/internal/jujuapi/controllerroot.go b/internal/jujuapi/controllerroot.go
index 2dcea46f9..806425429 100644
--- a/internal/jujuapi/controllerroot.go
+++ b/internal/jujuapi/controllerroot.go
@@ -9,10 +9,10 @@ import (
 	"github.com/juju/names/v4"
 	"github.com/rogpeppe/fastuuid"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi/rpc"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jujuapi/rpc"
 )
 
 // controllerRoot is the root for endpoints served on controller connections.
diff --git a/internal/jujuapi/jimm.go b/internal/jujuapi/jimm.go
index 0dfeab50e..4bd3566c5 100644
--- a/internal/jujuapi/jimm.go
+++ b/internal/jujuapi/jimm.go
@@ -13,11 +13,11 @@ import (
 	"github.com/juju/zaputil"
 	"github.com/juju/zaputil/zapctx"
 
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi/rpc"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jujuapi/rpc"
 )
 
 func init() {
diff --git a/internal/jujuapi/jimm_test.go b/internal/jujuapi/jimm_test.go
index 1c1419e97..d24c51d6a 100644
--- a/internal/jujuapi/jimm_test.go
+++ b/internal/jujuapi/jimm_test.go
@@ -16,11 +16,11 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/api"
-	apiparams "github.com/CanonicalLtd/jimm/api/params"
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi"
+	"github.com/canonical/jimm/api"
+	apiparams "github.com/canonical/jimm/api/params"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/jujuapi"
 )
 
 type jimmSuite struct {
diff --git a/internal/jujuapi/modelmanager.go b/internal/jujuapi/modelmanager.go
index 33f91e4cb..a23fa06a5 100644
--- a/internal/jujuapi/modelmanager.go
+++ b/internal/jujuapi/modelmanager.go
@@ -9,11 +9,11 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi/rpc"
-	"github.com/CanonicalLtd/jimm/internal/servermon"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jujuapi/rpc"
+	"github.com/canonical/jimm/internal/servermon"
 )
 
 func init() {
diff --git a/internal/jujuapi/modelmanager_test.go b/internal/jujuapi/modelmanager_test.go
index a78e7346e..69688c0f5 100644
--- a/internal/jujuapi/modelmanager_test.go
+++ b/internal/jujuapi/modelmanager_test.go
@@ -25,9 +25,9 @@ import (
 	"github.com/juju/utils/v2"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
-	"github.com/CanonicalLtd/jimm/internal/kubetest"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/kubetest"
 )
 
 const jujuVersion = "3.1.4"
diff --git a/internal/jujuapi/modelroot.go b/internal/jujuapi/modelroot.go
index 311b4286d..52d8eeaa8 100644
--- a/internal/jujuapi/modelroot.go
+++ b/internal/jujuapi/modelroot.go
@@ -5,8 +5,8 @@ package jujuapi
 import (
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi/rpc"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jujuapi/rpc"
 )
 
 // modelRoot is the root for endpoints served on model connections.
diff --git a/internal/jujuapi/modelsummarywatcher.go b/internal/jujuapi/modelsummarywatcher.go
index bee6c7421..07ced8006 100644
--- a/internal/jujuapi/modelsummarywatcher.go
+++ b/internal/jujuapi/modelsummarywatcher.go
@@ -14,9 +14,9 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi/rpc"
-	"github.com/CanonicalLtd/jimm/internal/pubsub"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jujuapi/rpc"
+	"github.com/canonical/jimm/internal/pubsub"
 )
 
 func init() {
diff --git a/internal/jujuapi/modelsummarywatcher_test.go b/internal/jujuapi/modelsummarywatcher_test.go
index ac77c7e0f..66c295cdf 100644
--- a/internal/jujuapi/modelsummarywatcher_test.go
+++ b/internal/jujuapi/modelsummarywatcher_test.go
@@ -11,7 +11,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/jujuapi"
+	"github.com/canonical/jimm/internal/jujuapi"
 )
 
 type modelSummaryWatcherSuite struct{}
diff --git a/internal/jujuapi/rpc/method_test.go b/internal/jujuapi/rpc/method_test.go
index 17b47631b..07128e047 100644
--- a/internal/jujuapi/rpc/method_test.go
+++ b/internal/jujuapi/rpc/method_test.go
@@ -9,7 +9,7 @@ import (
 
 	qt "github.com/frankban/quicktest"
 
-	"github.com/CanonicalLtd/jimm/internal/jujuapi/rpc"
+	"github.com/canonical/jimm/internal/jujuapi/rpc"
 )
 
 type S1 struct{}
diff --git a/internal/jujuapi/rpc/root_test.go b/internal/jujuapi/rpc/root_test.go
index 19568a75f..fc6ac7765 100644
--- a/internal/jujuapi/rpc/root_test.go
+++ b/internal/jujuapi/rpc/root_test.go
@@ -14,7 +14,7 @@ import (
 	jujurpc "github.com/juju/juju/rpc"
 	"github.com/juju/juju/rpc/jsoncodec"
 
-	"github.com/CanonicalLtd/jimm/internal/jujuapi/rpc"
+	"github.com/canonical/jimm/internal/jujuapi/rpc"
 )
 
 func TestRPC(t *testing.T) {
diff --git a/internal/jujuapi/usermanager.go b/internal/jujuapi/usermanager.go
index 0c7a69156..d772be4b3 100644
--- a/internal/jujuapi/usermanager.go
+++ b/internal/jujuapi/usermanager.go
@@ -7,8 +7,8 @@ import (
 
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi/rpc"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jujuapi/rpc"
 )
 
 func init() {
diff --git a/internal/jujuapi/websocket.go b/internal/jujuapi/websocket.go
index 41cb3d5ac..c1a1feb16 100644
--- a/internal/jujuapi/websocket.go
+++ b/internal/jujuapi/websocket.go
@@ -17,11 +17,11 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmhttp"
-	"github.com/CanonicalLtd/jimm/internal/servermon"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmhttp"
+	"github.com/canonical/jimm/internal/servermon"
 )
 
 const (
diff --git a/internal/jujuapi/websocket_test.go b/internal/jujuapi/websocket_test.go
index e5e4e2620..d05876684 100644
--- a/internal/jujuapi/websocket_test.go
+++ b/internal/jujuapi/websocket_test.go
@@ -19,9 +19,9 @@ import (
 	"github.com/juju/names/v4"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/jujuapi"
 )
 
 type websocketSuite struct {
diff --git a/internal/jujuclient/allwatcher.go b/internal/jujuclient/allwatcher.go
index c86992ebe..1740b6375 100644
--- a/internal/jujuclient/allwatcher.go
+++ b/internal/jujuclient/allwatcher.go
@@ -8,7 +8,7 @@ import (
 	jujuerrors "github.com/juju/errors"
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // WatchAllModels initialises a new AllModelWatcher. On success the watcher
diff --git a/internal/jujuclient/applicationoffers.go b/internal/jujuclient/applicationoffers.go
index dfdbb7906..6b2be7510 100644
--- a/internal/jujuclient/applicationoffers.go
+++ b/internal/jujuclient/applicationoffers.go
@@ -11,7 +11,7 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // Offer creates a new ApplicationOffer on the controller. Offer uses the
diff --git a/internal/jujuclient/applicationoffers_test.go b/internal/jujuclient/applicationoffers_test.go
index 2372f91aa..31f9404db 100644
--- a/internal/jujuclient/applicationoffers_test.go
+++ b/internal/jujuclient/applicationoffers_test.go
@@ -15,8 +15,8 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type applicationoffersSuite struct {
diff --git a/internal/jujuclient/client.go b/internal/jujuclient/client.go
index 5006ab7c5..1cb70e907 100644
--- a/internal/jujuclient/client.go
+++ b/internal/jujuclient/client.go
@@ -8,7 +8,7 @@ import (
 	jujuerrors "github.com/juju/errors"
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // Status returns the status of the juju model.
diff --git a/internal/jujuclient/client_test.go b/internal/jujuclient/client_test.go
index 38f18f42a..20ac8b717 100644
--- a/internal/jujuclient/client_test.go
+++ b/internal/jujuclient/client_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/juju/names/v4"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type clientSuite struct {
diff --git a/internal/jujuclient/cloud.go b/internal/jujuclient/cloud.go
index e7c4a4449..646a3de75 100644
--- a/internal/jujuclient/cloud.go
+++ b/internal/jujuclient/cloud.go
@@ -11,7 +11,7 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // SupportsCheckCredentialModels reports whether the controller supports
diff --git a/internal/jujuclient/cloud_test.go b/internal/jujuclient/cloud_test.go
index 17de03335..8a61e5199 100644
--- a/internal/jujuclient/cloud_test.go
+++ b/internal/jujuclient/cloud_test.go
@@ -9,7 +9,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type cloudSuite struct {
diff --git a/internal/jujuclient/dial.go b/internal/jujuclient/dial.go
index 2e4be0ccc..d9c5c1d60 100644
--- a/internal/jujuclient/dial.go
+++ b/internal/jujuclient/dial.go
@@ -26,10 +26,10 @@ import (
 	"github.com/juju/zaputil/zapctx"
 	"go.uber.org/zap"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/rpc"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/rpc"
 )
 
 const (
diff --git a/internal/jujuclient/dial_test.go b/internal/jujuclient/dial_test.go
index ecad32334..1032256f0 100644
--- a/internal/jujuclient/dial_test.go
+++ b/internal/jujuclient/dial_test.go
@@ -13,11 +13,11 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
-	"github.com/CanonicalLtd/jimm/internal/jujuclient"
-	"github.com/CanonicalLtd/jimm/internal/vault"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/jujuclient"
+	"github.com/canonical/jimm/internal/vault"
 )
 
 type jujuclientSuite struct {
diff --git a/internal/jujuclient/modelmanager.go b/internal/jujuclient/modelmanager.go
index d73f73d4e..88544066d 100644
--- a/internal/jujuclient/modelmanager.go
+++ b/internal/jujuclient/modelmanager.go
@@ -10,7 +10,7 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // CreateModel creates a new model as specified by the given model
diff --git a/internal/jujuclient/modelmanager_test.go b/internal/jujuclient/modelmanager_test.go
index 610bf51a5..a3f0cada7 100644
--- a/internal/jujuclient/modelmanager_test.go
+++ b/internal/jujuclient/modelmanager_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/juju/utils/v2"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type modelmanagerSuite struct {
diff --git a/internal/jujuclient/modelsummarywatcher.go b/internal/jujuclient/modelsummarywatcher.go
index d54a16c22..354a261e3 100644
--- a/internal/jujuclient/modelsummarywatcher.go
+++ b/internal/jujuclient/modelsummarywatcher.go
@@ -8,7 +8,7 @@ import (
 	jujuerrors "github.com/juju/errors"
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // SupportsModelSummaryWatcher reports whether the controller supports
diff --git a/internal/jujuclient/modelwatcher.go b/internal/jujuclient/modelwatcher.go
index a434b312f..64eea22e7 100644
--- a/internal/jujuclient/modelwatcher.go
+++ b/internal/jujuclient/modelwatcher.go
@@ -8,7 +8,7 @@ import (
 	jujuerrors "github.com/juju/errors"
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // WatchAll initialises a new ModelWatcher. On success the watcher
diff --git a/internal/jujuclient/modelwatcher_test.go b/internal/jujuclient/modelwatcher_test.go
index 19eb3b937..efa8355a2 100644
--- a/internal/jujuclient/modelwatcher_test.go
+++ b/internal/jujuclient/modelwatcher_test.go
@@ -5,14 +5,14 @@ package jujuclient_test
 import (
 	"context"
 
-	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/juju/core/network"
+	jujuparams "github.com/juju/juju/rpc/params"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
-	"github.com/CanonicalLtd/jimm/internal/jujuclient"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/jujuclient"
 )
 
 type modelWatcherSuite struct {
diff --git a/internal/jujuclient/ping.go b/internal/jujuclient/ping.go
index 3a9bea09d..12ef5b97d 100644
--- a/internal/jujuclient/ping.go
+++ b/internal/jujuclient/ping.go
@@ -5,7 +5,7 @@ package jujuclient
 import (
 	"context"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // Ping sends a ping message accross the connection and waits for a
diff --git a/internal/jujuclient/ping_test.go b/internal/jujuclient/ping_test.go
index fd74231b0..e2465518d 100644
--- a/internal/jujuclient/ping_test.go
+++ b/internal/jujuclient/ping_test.go
@@ -5,7 +5,7 @@ package jujuclient_test
 import (
 	"context"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/dbmodel"
 	"github.com/juju/names/v4"
 	gc "gopkg.in/check.v1"
 )
diff --git a/internal/jujuclient/storage.go b/internal/jujuclient/storage.go
index 26ddf5b5e..ecbfae1c9 100644
--- a/internal/jujuclient/storage.go
+++ b/internal/jujuclient/storage.go
@@ -9,7 +9,7 @@ import (
 	jujuparams "github.com/juju/juju/rpc/params"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // ListFilesystems lists filesystems for desired machines.
diff --git a/internal/jujuclient/storage_test.go b/internal/jujuclient/storage_test.go
index ec286dacf..5fc2fd3a9 100644
--- a/internal/jujuclient/storage_test.go
+++ b/internal/jujuclient/storage_test.go
@@ -8,8 +8,8 @@ import (
 	"github.com/juju/names/v4"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/dbmodel"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/dbmodel"
+	"github.com/canonical/jimm/internal/jimmtest"
 )
 
 type storageSuite struct {
diff --git a/internal/pubsub/hub.go b/internal/pubsub/hub.go
index 7d75acdca..5335aa304 100644
--- a/internal/pubsub/hub.go
+++ b/internal/pubsub/hub.go
@@ -8,7 +8,7 @@ package pubsub
 import (
 	"sync"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 	"github.com/juju/utils/v2/parallel"
 )
 
diff --git a/internal/pubsub/hub_test.go b/internal/pubsub/hub_test.go
index 08b466bf9..08c092ace 100644
--- a/internal/pubsub/hub_test.go
+++ b/internal/pubsub/hub_test.go
@@ -9,7 +9,7 @@ import (
 	jc "github.com/juju/testing/checkers"
 	gc "gopkg.in/check.v1"
 
-	"github.com/CanonicalLtd/jimm/internal/pubsub"
+	"github.com/canonical/jimm/internal/pubsub"
 )
 
 func TestPackage(t *testing.T) {
diff --git a/internal/rpc/client.go b/internal/rpc/client.go
index 37039c7e4..d92023f2d 100644
--- a/internal/rpc/client.go
+++ b/internal/rpc/client.go
@@ -14,7 +14,7 @@ import (
 	"github.com/gorilla/websocket"
 	jujuparams "github.com/juju/juju/rpc/params"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 // An Error represents an error sent in an RPC response.
diff --git a/internal/rpc/client_test.go b/internal/rpc/client_test.go
index db4832246..2019788c4 100644
--- a/internal/rpc/client_test.go
+++ b/internal/rpc/client_test.go
@@ -15,8 +15,8 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/gorilla/websocket"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/rpc"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/rpc"
 )
 
 func TestDialError(t *testing.T) {
diff --git a/internal/vault/vault.go b/internal/vault/vault.go
index 4493bcc9a..51313311b 100644
--- a/internal/vault/vault.go
+++ b/internal/vault/vault.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/vault/api"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/errors"
 )
 
 const (
diff --git a/internal/vault/vault_test.go b/internal/vault/vault_test.go
index 10d5afa96..59c6c158d 100644
--- a/internal/vault/vault_test.go
+++ b/internal/vault/vault_test.go
@@ -11,8 +11,8 @@ import (
 	qt "github.com/frankban/quicktest"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
-	"github.com/CanonicalLtd/jimm/internal/vault"
+	"github.com/canonical/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/vault"
 )
 
 func TestMain(m *testing.M) {
diff --git a/local/authy/main.go b/local/authy/main.go
index e9a8dc477..2a9df6e47 100644
--- a/local/authy/main.go
+++ b/local/authy/main.go
@@ -13,7 +13,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/CanonicalLtd/jimm/internal/rpc"
+	"github.com/canonical/jimm/internal/rpc"
 	"github.com/go-macaroon-bakery/macaroon-bakery/v3/httpbakery"
 	jujuparams "github.com/juju/juju/rpc/params"
 	"gopkg.in/errgo.v1"
diff --git a/service.go b/service.go
index 32c12fe77..50961d06c 100644
--- a/service.go
+++ b/service.go
@@ -25,18 +25,18 @@ import (
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 
-	"github.com/CanonicalLtd/jimm/internal/auth"
-	"github.com/CanonicalLtd/jimm/internal/dashboard"
-	"github.com/CanonicalLtd/jimm/internal/db"
-	"github.com/CanonicalLtd/jimm/internal/debugapi"
-	"github.com/CanonicalLtd/jimm/internal/errors"
-	"github.com/CanonicalLtd/jimm/internal/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jujuapi"
-	"github.com/CanonicalLtd/jimm/internal/jujuclient"
-	"github.com/CanonicalLtd/jimm/internal/logger"
-	"github.com/CanonicalLtd/jimm/internal/pubsub"
-	"github.com/CanonicalLtd/jimm/internal/servermon"
-	"github.com/CanonicalLtd/jimm/internal/vault"
+	"github.com/canonical/jimm/internal/auth"
+	"github.com/canonical/jimm/internal/dashboard"
+	"github.com/canonical/jimm/internal/db"
+	"github.com/canonical/jimm/internal/debugapi"
+	"github.com/canonical/jimm/internal/errors"
+	"github.com/canonical/jimm/internal/jimm"
+	"github.com/canonical/jimm/internal/jujuapi"
+	"github.com/canonical/jimm/internal/jujuclient"
+	"github.com/canonical/jimm/internal/logger"
+	"github.com/canonical/jimm/internal/pubsub"
+	"github.com/canonical/jimm/internal/servermon"
+	"github.com/canonical/jimm/internal/vault"
 )
 
 // A VaultStore is a store for the attributes of a
diff --git a/service_test.go b/service_test.go
index 303d14164..deff0609f 100644
--- a/service_test.go
+++ b/service_test.go
@@ -23,9 +23,9 @@ import (
 	jujucloud "github.com/juju/juju/cloud"
 	"github.com/juju/names/v4"
 
-	"github.com/CanonicalLtd/jimm"
-	"github.com/CanonicalLtd/jimm/internal/jimmtest"
-	"github.com/CanonicalLtd/jimm/internal/vault"
+	"github.com/canonical/jimm"
+	"github.com/canonical/jimm/internal/jimmtest"
+	"github.com/canonical/jimm/internal/vault"
 )
 
 func TestMain(m *testing.M) {
diff --git a/snaps/jaas/snapcraft.yaml b/snaps/jaas/snapcraft.yaml
index b4ed1b296..48b43fec3 100644
--- a/snaps/jaas/snapcraft.yaml
+++ b/snaps/jaas/snapcraft.yaml
@@ -28,7 +28,7 @@ parts:
     - bin/jimmctl
     override-build: |
       set -e
-      go install -mod readonly -p 16 -ldflags '-linkmode=external' github.com/CanonicalLtd/jimm/cmd/jimmctl
+      go install -mod readonly -p 16 -ldflags '-linkmode=external' github.com/canonical/jimm/cmd/jimmctl
 
   files:
     plugin: dump
diff --git a/snaps/jimm/snapcraft.yaml b/snaps/jimm/snapcraft.yaml
index 374ad0169..48fbcbbd9 100644
--- a/snaps/jimm/snapcraft.yaml
+++ b/snaps/jimm/snapcraft.yaml
@@ -29,4 +29,4 @@ parts:
       snapcraftctl set-version `cat $SNAPCRAFT_PART_SRC/version/version.txt`
     override-build: |-
       set -e
-      go install -mod readonly -ldflags '-linkmode=external' -tags version github.com/CanonicalLtd/jimm/cmd/jimmsrv
+      go install -mod readonly -ldflags '-linkmode=external' -tags version github.com/canonical/jimm/cmd/jimmsrv