diff --git a/.github/workflows/charts-release.yaml b/.github/workflows/charts-release.yaml
index e69d81e..a5649a6 100644
--- a/.github/workflows/charts-release.yaml
+++ b/.github/workflows/charts-release.yaml
@@ -3,7 +3,7 @@ name: Release Charts
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - 'charts/**' 
 
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index c4e71bb..67c9d93 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -3,12 +3,12 @@ name: Release
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - v*
 
 env:
-  REGISTRY_NAME: ghcr.io/shapeblue
+  REGISTRY_NAME: ghcr.io/cloudstack
   IMAGES: "cloudstack-csi-driver cloudstack-csi-sc-syncer"
 
 jobs:
@@ -38,12 +38,12 @@ jobs:
           username: ${{github.actor}}
           password: ${{secrets.GITHUB_TOKEN}}
 
-      - name: Push master
-        if: github.ref == 'refs/heads/master'
+      - name: Push main
+        if: github.ref == 'refs/heads/main'
         run: |
           for img in $IMAGES; do
-              docker tag ${img} ${REGISTRY_NAME}/${img}:master
-              docker push ${REGISTRY_NAME}/${img}:master
+              docker tag ${img} ${REGISTRY_NAME}/${img}:main
+              docker push ${REGISTRY_NAME}/${img}:main
           done
 
       - name: Push tagged release
diff --git a/.golangci.yml b/.golangci.yml
index 5399b8e..5bae2ea 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -13,9 +13,9 @@ linters-settings:
     sections:
       - standard
       - default
-      - prefix(github.com/shapeblue/cloudstack-csi-driver)
+      - prefix(github.com/cloudstack/cloudstack-csi-driver)
   goimports:
-    local-prefixes: github.com/shapeblue/cloudstack-csi-driver
+    local-prefixes: github.com/cloudstack/cloudstack-csi-driver
 
   misspell:
     locale: US
diff --git a/README.md b/README.md
index fa7bc62..55641bb 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # CloudStack CSI Driver
 
-[![Go Reference](https://pkg.go.dev/badge/github.com/shapeblue/cloudstack-csi-driver.svg)](https://pkg.go.dev/github.com/shapeblue/cloudstack-csi-driver)
-[![Go Report Card](https://goreportcard.com/badge/github.com/shapeblue/cloudstack-csi-driver)](https://goreportcard.com/report/github.com/shapeblue/cloudstack-csi-driver)
-[![Release](https://github.com/shapeblue/cloudstack-csi-driver/workflows/Release/badge.svg?branch=master)](https://github.com/shapeblue/cloudstack-csi-driver/actions)
+[![Go Reference](https://pkg.go.dev/badge/github.com/cloudstack/cloudstack-csi-driver.svg)](https://pkg.go.dev/github.com/cloudstack/cloudstack-csi-driver)
+[![Go Report Card](https://goreportcard.com/badge/github.com/cloudstack/cloudstack-csi-driver)](https://goreportcard.com/report/github.com/cloudstack/cloudstack-csi-driver)
+[![Release](https://github.com/cloudstack/cloudstack-csi-driver/workflows/Release/badge.svg?branch=main)](https://github.com/cloudstack/cloudstack-csi-driver/actions)
 
 This repository provides a [Container Storage Interface (CSI)](https://github.com/container-storage-interface/spec)
 plugin for [Apache CloudStack](https://cloudstack.apache.org/).
@@ -56,7 +56,7 @@ you may use the same secret for both tools.
 ### Deployment
 
 ```
-kubectl apply -f https://github.com/shapeblue/cloudstack-csi-driver/releases/latest/download/manifest.yaml
+kubectl apply -f https://github.com/cloudstack/cloudstack-csi-driver/releases/latest/download/manifest.yaml
 ```
 
 ### Creation of Storage classes
@@ -130,4 +130,4 @@ License at <http://www.apache.org/licenses/LICENSE-2.0>
 
 ## Contributors
 
-[![CloudStack CSI Driver Contributors](https://contrib.rocks/image?repo=shapeblue/cloudstack-csi-driver&anon=0&max=500)](https://github.com/shapeblue/cloudstack-csi-driver/graphs/contributors)
+[![CloudStack CSI Driver Contributors](https://contrib.rocks/image?repo=cloudstack/cloudstack-csi-driver&anon=0&max=500)](https://github.com/cloudstack/cloudstack-csi-driver/graphs/contributors)
diff --git a/charts/cloudstack-csi/Chart.yaml b/charts/cloudstack-csi/Chart.yaml
index af3e07f..e187a38 100644
--- a/charts/cloudstack-csi/Chart.yaml
+++ b/charts/cloudstack-csi/Chart.yaml
@@ -2,10 +2,10 @@ apiVersion: v2
 name: cloudstack-csi
 description: A Helm chart for CloudStack CSI driver
 type: application
-version: 2.0.2
+version: 2.0.3
 appVersion: 0.6.1
 sources:
-  - https://github.com/shapeblue/cloudstack-csi-driver
+  - https://github.com/cloudstack/cloudstack-csi-driver
 keywords:
   - csi
   - cloudStack
diff --git a/charts/cloudstack-csi/values.yaml b/charts/cloudstack-csi/values.yaml
index cfbc3b4..3cea335 100644
--- a/charts/cloudstack-csi/values.yaml
+++ b/charts/cloudstack-csi/values.yaml
@@ -135,7 +135,7 @@ sidecars:
 controller:
   enabled: true
   image:
-    repository: ghcr.io/shapeblue/cloudstack-csi-driver
+    repository: ghcr.io/cloudstack/cloudstack-csi-driver
     # Overrides the image tag whose default is v{{ .Chart.AppVersion }}
     tag: ""
     pullPolicy: IfNotPresent
@@ -241,7 +241,7 @@ controller:
 node:
   enabled: true
   image:
-    repository: ghcr.io/shapeblue/cloudstack-csi-driver
+    repository: ghcr.io/cloudstack/cloudstack-csi-driver
     # Overrides the image tag whose default is v{{ .Chart.AppVersion }}
     tag: ""
     pullPolicy: IfNotPresent
@@ -323,7 +323,7 @@ syncer:
   enabled: true
   # Job image
   image:
-    repository: "ghcr.io/shapeblue/cloudstack-csi-sc-syncer"
+    repository: "ghcr.io/cloudstack/cloudstack-csi-sc-syncer"
     # Overrides the image tag. Default is {{ .Chart.AppVersion }}
     tag: ""
     imagePullPolicy: IfNotPresent
diff --git a/cmd/cloudstack-csi-driver/Dockerfile b/cmd/cloudstack-csi-driver/Dockerfile
index 4c260e8..8bf16e2 100644
--- a/cmd/cloudstack-csi-driver/Dockerfile
+++ b/cmd/cloudstack-csi-driver/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.18
 
 LABEL \
     org.opencontainers.image.description="CloudStack CSI driver" \
-    org.opencontainers.image.source="https://github.com/shapeblue/cloudstack-csi-driver/"
+    org.opencontainers.image.source="https://github.com/cloudstack/cloudstack-csi-driver/"
 
 RUN apk add --no-cache \
     ca-certificates \
diff --git a/cmd/cloudstack-csi-driver/main.go b/cmd/cloudstack-csi-driver/main.go
index 02d5732..576cd69 100644
--- a/cmd/cloudstack-csi-driver/main.go
+++ b/cmd/cloudstack-csi-driver/main.go
@@ -18,8 +18,8 @@ import (
 	"k8s.io/component-base/logs/json"
 	"k8s.io/klog/v2"
 
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/cloud"
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/driver"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/cloud"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/driver"
 )
 
 func main() {
diff --git a/cmd/cloudstack-csi-sc-syncer/Dockerfile b/cmd/cloudstack-csi-sc-syncer/Dockerfile
index 2bdd8a1..9965717 100644
--- a/cmd/cloudstack-csi-sc-syncer/Dockerfile
+++ b/cmd/cloudstack-csi-sc-syncer/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.18
 
 LABEL \
     org.opencontainers.image.description="CloudStack disk offering to Kubernetes storage class syncer" \
-    org.opencontainers.image.source="https://github.com/shapeblue/cloudstack-csi-driver/"
+    org.opencontainers.image.source="https://github.com/cloudstack/cloudstack-csi-driver/"
 
 RUN apk add --no-cache ca-certificates
 
diff --git a/cmd/cloudstack-csi-sc-syncer/README.md b/cmd/cloudstack-csi-sc-syncer/README.md
index 7935a5b..c60491a 100644
--- a/cmd/cloudstack-csi-sc-syncer/README.md
+++ b/cmd/cloudstack-csi-sc-syncer/README.md
@@ -20,7 +20,7 @@ You may use it locally or as a Kubernetes Job.
 You must have a CloudStack configuration file and a Kubernetes `kubeconfig`
 file.
 
-1. Download `cloudstack-csi-sc-syncer` from [latest release](https://github.com/shapeblue/cloudstack-csi-driver/releases/latest/);
+1. Download `cloudstack-csi-sc-syncer` from [latest release](https://github.com/cloudstack/cloudstack-csi-driver/releases/latest/);
 
 1. Set the execution permission:
 
@@ -85,7 +85,7 @@ spec:
       serviceAccountName: cloudstack-csi-sc-syncer
       containers:
         - name: cloudstack-csi-sc-syncer
-          image: ghcr.io/shapeblue/cloudstack-csi-sc-syncer:${version}
+          image: ghcr.io/cloudstack/cloudstack-csi-sc-syncer:${version}
           args:
             - "-cloudstackconfig=/etc/cloudstack-csi-driver/cloud-config"
             - "-kubeconfig=-"
diff --git a/cmd/cloudstack-csi-sc-syncer/main.go b/cmd/cloudstack-csi-sc-syncer/main.go
index 912bc2b..9ac113e 100644
--- a/cmd/cloudstack-csi-sc-syncer/main.go
+++ b/cmd/cloudstack-csi-sc-syncer/main.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/syncer"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/syncer"
 )
 
 const agent = "cloudstack-csi-sc-syncer"
diff --git a/go.mod b/go.mod
index 84aa4cf..e08d930 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/shapeblue/cloudstack-csi-driver
+module github.com/cloudstack/cloudstack-csi-driver
 
 go 1.21
 
diff --git a/pkg/cloud/fake/fake.go b/pkg/cloud/fake/fake.go
index 23218bc..f3e0052 100644
--- a/pkg/cloud/fake/fake.go
+++ b/pkg/cloud/fake/fake.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/hashicorp/go-uuid"
 
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/cloud"
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/util"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/cloud"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/util"
 )
 
 const zoneID = "a1887604-237c-4212-a9cd-94620b7880fa"
diff --git a/pkg/cloud/volumes.go b/pkg/cloud/volumes.go
index 831cdec..2d64b58 100644
--- a/pkg/cloud/volumes.go
+++ b/pkg/cloud/volumes.go
@@ -9,7 +9,7 @@ import (
 	"github.com/apache/cloudstack-go/v2/cloudstack"
 	"k8s.io/klog/v2"
 
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/util"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/util"
 )
 
 func (c *client) listVolumes(p *cloudstack.ListVolumesParams) (*Volume, error) {
diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
index 70dffa3..506eb96 100644
--- a/pkg/driver/controller.go
+++ b/pkg/driver/controller.go
@@ -12,8 +12,8 @@ import (
 	"google.golang.org/grpc/status"
 	"k8s.io/klog/v2"
 
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/cloud"
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/util"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/cloud"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/util"
 )
 
 // onlyVolumeCapAccessMode is the only volume capability access
diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go
index 2d0f59b..9420d34 100644
--- a/pkg/driver/driver.go
+++ b/pkg/driver/driver.go
@@ -12,9 +12,9 @@ import (
 	"google.golang.org/grpc"
 	"k8s.io/klog/v2"
 
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/cloud"
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/mount"
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/util"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/cloud"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/mount"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/util"
 )
 
 // Interface is the CloudStack CSI driver interface.
diff --git a/pkg/driver/node.go b/pkg/driver/node.go
index 8fd3f29..e764162 100644
--- a/pkg/driver/node.go
+++ b/pkg/driver/node.go
@@ -13,9 +13,9 @@ import (
 	"google.golang.org/grpc/status"
 	"k8s.io/klog/v2"
 
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/cloud"
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/mount"
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/util"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/cloud"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/mount"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/util"
 )
 
 const (
diff --git a/pkg/syncer/run.go b/pkg/syncer/run.go
index 8216a0b..60c1704 100644
--- a/pkg/syncer/run.go
+++ b/pkg/syncer/run.go
@@ -13,7 +13,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/driver"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/driver"
 )
 
 var (
diff --git a/pkg/syncer/syncer.go b/pkg/syncer/syncer.go
index ddc0f8a..52b3a52 100644
--- a/pkg/syncer/syncer.go
+++ b/pkg/syncer/syncer.go
@@ -15,7 +15,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/cloud"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/cloud"
 )
 
 // Config holds the syncer tool configuration.
diff --git a/test/sanity/sanity_test.go b/test/sanity/sanity_test.go
index c1ad0d0..e4c7a96 100644
--- a/test/sanity/sanity_test.go
+++ b/test/sanity/sanity_test.go
@@ -11,10 +11,10 @@ import (
 
 	"k8s.io/klog/v2"
 
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/cloud/fake"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/driver"
+	"github.com/cloudstack/cloudstack-csi-driver/pkg/mount"
 	"github.com/kubernetes-csi/csi-test/v5/pkg/sanity"
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/cloud/fake"
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/driver"
-	"github.com/shapeblue/cloudstack-csi-driver/pkg/mount"
 )
 
 func TestSanity(t *testing.T) {