diff --git a/charts/s3gw/Chart.yaml b/charts/s3gw/Chart.yaml
index ca8b788..7de31c1 100644
--- a/charts/s3gw/Chart.yaml
+++ b/charts/s3gw/Chart.yaml
@@ -4,32 +4,31 @@ name: s3gw
 version: 0.23.0
 kubeVersion: ">=1.14"
 description: |
-  Easy-to-use Open Source and Cloud Native S3 service for use on Rancher's
-  Kubernetes.
+  Easy-to-use Open Source and Cloud Native S3 service for use on Kubernetes.
 type: application
 keywords:
   - storage
   - s3
-home: https://github.com/aquarist-labs/s3gw
-icon: https://s3gw.io/img/logo-xl.png
+home: https://github.com/s3gw-tech/s3gw
+icon: https://s3gw.tech/img/logo-xl.png
 sources:
-  - https://github.com/aquarist-labs/s3gw-charts
-  - https://github.com/aquarist-labs/s3gw
-  - https://github.com/aquarist-labs/ceph
-  - https://github.com/aquarist-labs/s3gw-ui
-  - https://github.com/aquarist-labs/s3gw-cosi-driver
+  - https://github.com/s3gw-tech/s3gw-charts
+  - https://github.com/s3gw-tech/s3gw
+  - https://github.com/s3gw-tech/s3gw-ceph
+  - https://github.com/s3gw-tech/s3gw-ui
+  - https://github.com/s3gw-tech/s3gw-cosi-driver
   - https://github.com/kubernetes-sigs/container-object-storage-interface-provisioner-sidecar
 maintainers:
-  - name: s3gw maintainers
-    email: s3gw@suse.com
-    url: https://github.com/orgs/aquarist-labs/projects/5
+  - name: s3gw contributors
+    email: contact@s3gw.tech
+    url: https://github.com/orgs/s3gw-tech/projects/1
 appVersion: "latest"
 deprecated: false
 annotations:
   artifacthub.io/category: storage
   artifacthub.io/links: |
     - name: homepage
-      url: https://s3gw.io/
+      url: https://s3gw.tech/
     - name: support
-      url: https://github.com/aquarist-labs/s3gw/issues
-  app.aquarist-labs.io/name: s3gw
+      url: https://github.com/s3gw-tech/s3gw/issues
+  app.s3gw.tech/name: s3gw
diff --git a/charts/s3gw/README.md b/charts/s3gw/README.md
index c9c54ca..3b890fa 100644
--- a/charts/s3gw/README.md
+++ b/charts/s3gw/README.md
@@ -16,7 +16,7 @@ To install s3gw using Helm add the chart to your Helm repository and then run
 `helm install`:
 
 ```bash
-helm repo add s3gw https://aquarist-labs.github.io/s3gw-charts/
+helm repo add s3gw https://charts.s3gw.tech
 helm \
   --namespace s3gw-system \
   install s3gw \
@@ -32,7 +32,7 @@ follows:
 
 - Cluster -> Projects/Namespaces - create the `s3gw` namespace.
 - Apps -> Repositories -> Create `s3gw` using the s3gw-charts Git URL
-  <https://aquarist-labs.github.io/s3gw-charts/> and the `main` branch.
+  <https://charts.s3gw.tech/> and the `main` branch.
 - Apps -> Charts -> Install `Traefik`.
 - Apps -> Charts -> Install `s3gw`. Select the `s3gw` namespace previously
   created. A `pvc` for `s3gw` will be created automatically during installation.
@@ -107,6 +107,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-[s3gw-url]: https://s3gw.io
+[s3gw-url]: https://s3gw.tech
 [docs-url]: https://s3gw-docs.readthedocs.io/en/latest/helm-charts/
 [ct-url]: https://github.com/helm/chart-testing
diff --git a/charts/s3gw/app-readme.md b/charts/s3gw/app-readme.md
index 3ad286f..8cad850 100644
--- a/charts/s3gw/app-readme.md
+++ b/charts/s3gw/app-readme.md
@@ -1,10 +1,8 @@
 # s3gw
 
 s3gw is an easy-to-use Open Source and Cloud Native S3 service running on
-Rancher's Kubernetes.
+Kubernetes.
 
-* It complements the Rancher portfolio by offering an S3 service for Longhorn
-  volume backups, Harvester backups, Epinio backups and OPNI models.
 * It is deployed on a single pod, ideal for development, Edge, IoT and smaller
   on-prem deployments.
 * It leverages the feature-rich S3 gateway from Ceph but without the rest of
@@ -13,4 +11,4 @@ Rancher's Kubernetes.
 For more information, see the [manual][1] and the [chart documentation][2].
 
 [1]: https://s3gw-docs.readthedocs.io
-[2]: https://github.com/aquarist-labs/s3gw-charts/blob/main/README.md
+[2]: https://github.com/s3gw-tech/s3gw-charts/blob/main/README.md
diff --git a/charts/s3gw/values.yaml b/charts/s3gw/values.yaml
index b93ca4e..7211155 100644
--- a/charts/s3gw/values.yaml
+++ b/charts/s3gw/values.yaml
@@ -38,7 +38,7 @@ tls:
 # To workaround that, please open the URL https://<HOSTNAME> in the
 # browser and accept the SSL certificate before accessing the UI
 # via https://<UI-HOSTNAME>.
-# Check https://github.com/aquarist-labs/s3gw/issues/31 to get more
+# Check https://github.com/s3gw-tech/s3gw/issues/31 to get more
 # information about the CORS issues.
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ui:
@@ -50,7 +50,7 @@ ui:
   publicDomain: ""
 
   # --- Developer Options ---
-  # imageName: "aquarist-labs/s3gw-ui"
+  # imageName: "s3gw-tech/s3gw-ui"
   # imageTag: "v0.0.0"
 
 # S3 Service
diff --git a/test-env/cluster-prepare.sh b/test-env/cluster-prepare.sh
index b25c97f..0adea47 100755
--- a/test-env/cluster-prepare.sh
+++ b/test-env/cluster-prepare.sh
@@ -46,7 +46,7 @@ set -e
 echo "Preparing k3d environment"
 
 helm repo add jetstack https://charts.jetstack.io
-helm repo add s3gw https://aquarist-labs.github.io/s3gw-charts/
+helm repo add s3gw https://charts.s3gw.tech
 helm repo update
 
 #Install the cert-manager