diff --git a/Justfile b/Justfile
index 908cd111..674853fd 100644
--- a/Justfile
+++ b/Justfile
@@ -25,11 +25,11 @@ generate-config-api-client: _remove-client-files
   just fmt-client
 
 setup-run:
-  grep -q "registry.terraform.io/arubauxi/hpeuxi" ~/.terraformrc && echo "Dev override found - installing provider locally" || { echo "Dev override not found - please follow README setup guide"; exit 1; }
+  grep -q "registry.terraform.io/aruba-uxi/hpeuxi" ~/.terraformrc && echo "Dev override found - installing provider locally" || { echo "Dev override not found - please follow README setup guide"; exit 1; }
   go install .
 
 remove-setup-run-dev-override:
-  sed -i '' '/registry\.terraform\.io\/arubauxi\/hpeuxi/d' ~/.terraformrc
+  sed -i '' '/registry\.terraform\.io\/aruba-uxi\/hpeuxi/d' ~/.terraformrc
 
 build-local:
   go run github.com/goreleaser/goreleaser/v2@latest release --clean --skip=publish,validate
diff --git a/README.md b/README.md
index 49ddda22..83c85d64 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ export HPEUXI_CLIENT_SECRET=<hpeuxi_client_secret>
 To override the host against which the API requests are made, use the env var as shown below, else UXI production is used as the default.
 
 ```bash
-export HPEUXI_HOST_OVERRIDE=https://api.staging.capedev.io
+export HPEUXI_HOST_OVERRIDE=api.staging.capedev.io
 ```
 
 ### Initialize Terraform working directory:
@@ -123,7 +123,7 @@ Example `~/.terraformrc` file
 ```
 provider_installation {
   dev_overrides {
-      "registry.terraform.io/arubauxi/hpeuxi" = "/Users/<user>/go/bin"
+      "registry.terraform.io/aruba-uxi/hpeuxi" = "/Users/<user>/go/bin"
   }
   direct {}
 }
@@ -164,9 +164,9 @@ Set the `GREENLAKE_UXI_CLIENT_ID` and `GREENLAKE_UXI_CLIENT_SECRET` environment
 environment.
 
 ```bash
-export GREENLAKE_UXI_CLIENT_ID=<client_id>
-export GREENLAKE_UXI_CLIENT_SECRET=<client_secret>
-export UXI_HOST=api.staging.capedev.io
+export HPEUXI_CLIENT_ID=<client_id>
+export HPEUXI_CLIENT_SECRET=<client_secret>
+export HPEUXI_HOST_OVERRIDE=api.staging.capedev.io
 ```
 
 ```shell
diff --git a/main.go b/main.go
index 333a7b22..290dc279 100644
--- a/main.go
+++ b/main.go
@@ -28,7 +28,7 @@ func main() {
 	flag.Parse()
 
 	opts := providerserver.ServeOpts{
-		Address: "registry.terraform.io/arubauxi/hpeuxi",
+		Address: "registry.terraform.io/aruba-uxi/hpeuxi",
 		Debug:   debug,
 	}