diff --git a/README.md b/README.md
index a9d8db4..a06ccab 100644
--- a/README.md
+++ b/README.md
@@ -35,9 +35,6 @@ kind: Application
 metadata:
   generateName: cert-manager-
   namespace: argocd
-  labels:
-    project.unikorn.eschercloud.ai: ${PROJECT}
-    controlplane.unikorn.eschercloud.ai: ${CONTROL_PLANE}
 spec:
   project: default
   source:
@@ -68,9 +65,9 @@ There is a top level chart-of-charts that will just install everything as a big
 <summary>Helm</summary>
 
 ```shell
-helm repo add eschercloudai-capi https://eschercloudai.github.io/helm-cluster-api
+helm repo add unikorn-cloud-capi https://unikorn-cloud.github.io/helm-cluster-api
 helm repo update
-helm install eschercloudai-capi/cluster-api --version v0.1.1
+helm install unikorn-cloud-capi/cluster-api --version v0.1.1
 ```
 </details>
 
@@ -86,7 +83,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://eschercloudai.github.io/helm-cluster-api
+    repoURL: https://unikorn-cloud.github.io/helm-cluster-api
     chart: cluster-api
     targetRevision: v0.1.9
   destination:
@@ -126,9 +123,9 @@ You may want to be a little less gung-ho and deploy the pieces as separate appli
 <summary>Helm</summary>
 
 ```shell
-helm repo add eschercloudai-capi https://eschercloudai.github.io/helm-cluster-api
+helm repo add unikorn-cloud-capi https://unikorn-cloud.github.io/helm-cluster-api
 helm repo update
-helm install eschercloudai-capi/cluster-api-core --version v0.1.1
+helm install unikorn-cloud-capi/cluster-api-core --version v0.1.1
 ```
 </details>
 
@@ -144,7 +141,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://eschercloudai.github.io/helm-cluster-api
+    repoURL: https://unikorn-cloud.github.io/helm-cluster-api
     chart: cluster-api-core
     targetRevision: v0.1.9
   destination:
@@ -175,9 +172,9 @@ spec:
 <summary>Helm</summary>
 
 ```shell
-helm repo add eschercloudai-capi https://eschercloudai.github.io/helm-cluster-api
+helm repo add unikorn-cloud-capi https://unikorn-cloud.github.io/helm-cluster-api
 helm repo update
-helm install eschercloudai-capi/cluster-api-bootstrap-kubeadm --version v0.1.1
+helm install unikorn-cloud-capi/cluster-api-bootstrap-kubeadm --version v0.1.1
 ```
 </details>
 
@@ -193,7 +190,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://eschercloudai.github.io/helm-cluster-api
+    repoURL: https://unikorn-cloud.github.io/helm-cluster-api
     chart: cluster-api-bootstrap-kubeadm
     targetRevision: v0.1.9
   destination:
@@ -217,9 +214,9 @@ spec:
 <summary>Helm</summary>
 
 ```shell
-helm repo add eschercloudai-capi https://eschercloudai.github.io/helm-cluster-api
+helm repo add unikorn-cloud-capi https://unikorn-cloud.github.io/helm-cluster-api
 helm repo update
-helm install eschercloudai-capi/cluster-api-control-plane-kubeadm --version v0.1.1
+helm install unikorn-cloud-capi/cluster-api-control-plane-kubeadm --version v0.1.1
 ```
 </details>
 
@@ -235,7 +232,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://eschercloudai.github.io/helm-cluster-api
+    repoURL: https://unikorn-cloud.github.io/helm-cluster-api
     chart: cluster-api-control-plane-kubeadm
     targetRevision: v0.1.9
   destination:
diff --git a/charts/cluster-api-bootstrap-kubeadm/Chart.yaml b/charts/cluster-api-bootstrap-kubeadm/Chart.yaml
index 27088b6..85d2c00 100644
--- a/charts/cluster-api-bootstrap-kubeadm/Chart.yaml
+++ b/charts/cluster-api-bootstrap-kubeadm/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 appVersion: v1.4.3
 description: A Helm chart for deploying cluster API.
-icon: https://raw.githubusercontent.com/eschercloudai/helm-cluster-api/main/icons/default.png
+icon: https://assets.unikorn-cloud.org/assets/images/logos/dark-on-light/icon.png
 name: cluster-api-bootstrap-kubeadm
 type: application
 version: v0.1.10
diff --git a/charts/cluster-api-cluster-autoscaler-openstack/Chart.yaml b/charts/cluster-api-cluster-autoscaler-openstack/Chart.yaml
index edb6231..b351164 100644
--- a/charts/cluster-api-cluster-autoscaler-openstack/Chart.yaml
+++ b/charts/cluster-api-cluster-autoscaler-openstack/Chart.yaml
@@ -3,4 +3,4 @@ name: cluster-api-cluster-autoscaler-openstack
 description: A Helm chart to deploy autoscaler configuration for a Kubernetes Cluster
 type: application
 version: v0.1.0
-icon: https://raw.githubusercontent.com/eschercloudai/helm-cluster-api/main/icons/default.png
+icon: https://raw.githubusercontent.com/unikorn-cloud/helm-cluster-api/main/icons/default.png
diff --git a/charts/cluster-api-cluster-openstack/Chart.yaml b/charts/cluster-api-cluster-openstack/Chart.yaml
index 3e7fdde..503d72f 100644
--- a/charts/cluster-api-cluster-openstack/Chart.yaml
+++ b/charts/cluster-api-cluster-openstack/Chart.yaml
@@ -3,4 +3,4 @@ name: cluster-api-cluster-openstack
 description: A Helm chart to deploy a Kubernetes Cluster
 type: application
 version: v0.3.26
-icon: https://raw.githubusercontent.com/eschercloudai/helm-cluster-api/main/icons/default.png
+icon: https://raw.githubusercontent.com/unikorn-cloud/helm-cluster-api/main/icons/default.png
diff --git a/charts/cluster-api-cluster-openstack/README.md b/charts/cluster-api-cluster-openstack/README.md
index a8f2e4f..d4e90b2 100644
--- a/charts/cluster-api-cluster-openstack/README.md
+++ b/charts/cluster-api-cluster-openstack/README.md
@@ -31,7 +31,7 @@ spec:
     namespace: foo
   project: default
   source:
-    repoURL: https://eschercloudai.github.io/helm-cluster-api
+    repoURL: https://unikorn-cloud.github.io/helm-cluster-api
     chart: cluster-api-cluster-openstack
     targetRevision: v0.1.2
     helm:
diff --git a/charts/cluster-api-cluster-openstack/values.yaml b/charts/cluster-api-cluster-openstack/values.yaml
index b57de57..8b6844a 100644
--- a/charts/cluster-api-cluster-openstack/values.yaml
+++ b/charts/cluster-api-cluster-openstack/values.yaml
@@ -1,5 +1,5 @@
 # Label domain for implicit labels defined in this chart.
-labelDomain: eschercloud.ai
+labelDomain: unikorn-cloud.org
 
 # Legacy resource names are very easy to go over the 63 character resource name
 # limit as you can imagine a 53 character release concatenated with an arbitrary
diff --git a/charts/cluster-api-control-plane-kubeadm/Chart.yaml b/charts/cluster-api-control-plane-kubeadm/Chart.yaml
index 7ba127a..f58024c 100644
--- a/charts/cluster-api-control-plane-kubeadm/Chart.yaml
+++ b/charts/cluster-api-control-plane-kubeadm/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 appVersion: v1.4.3
 description: A Helm chart for deploying cluster API.
-icon: https://raw.githubusercontent.com/eschercloudai/helm-cluster-api/main/icons/default.png
+icon: https://assets.unikorn-cloud.org/assets/images/logos/dark-on-light/icon.png
 name: cluster-api-control-plane-kubeadm
 type: application
 version: v0.1.10
diff --git a/charts/cluster-api-core/Chart.yaml b/charts/cluster-api-core/Chart.yaml
index b928661..004909a 100644
--- a/charts/cluster-api-core/Chart.yaml
+++ b/charts/cluster-api-core/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 appVersion: v1.4.3
 description: A Helm chart for deploying cluster API.
-icon: https://raw.githubusercontent.com/eschercloudai/helm-cluster-api/main/icons/default.png
+icon: https://assets.unikorn-cloud.org/assets/images/logos/dark-on-light/icon.png
 name: cluster-api-core
 type: application
 version: v0.1.10
diff --git a/charts/cluster-api-provider-openstack/Chart.yaml b/charts/cluster-api-provider-openstack/Chart.yaml
index afaef65..e3dbeab 100644
--- a/charts/cluster-api-provider-openstack/Chart.yaml
+++ b/charts/cluster-api-provider-openstack/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 appVersion: v0.8.0
 description: A Helm chart for deploying cluster API.
-icon: https://raw.githubusercontent.com/eschercloudai/helm-cluster-api/main/icons/default.png
+icon: https://assets.unikorn-cloud.org/assets/images/logos/dark-on-light/icon.png
 name: cluster-api-provider-openstack
 type: application
 version: v0.1.10
diff --git a/charts/cluster-api/Chart.yaml b/charts/cluster-api/Chart.yaml
index 8b95848..b198846 100644
--- a/charts/cluster-api/Chart.yaml
+++ b/charts/cluster-api/Chart.yaml
@@ -4,7 +4,7 @@ name: cluster-api
 description: A Helm chart to deploy Cluster API
 type: application
 version: v0.1.10
-icon: https://raw.githubusercontent.com/eschercloudai/helm-cluster-api/main/icons/default.png
+icon: https://assets.unikorn-cloud.org/assets/images/logos/dark-on-light/icon.png
 
 dependencies:
 - name: cluster-api-core
diff --git a/charts/cluster-api/templates/NOTES.txt b/charts/cluster-api/templates/NOTES.txt
index 70eb29b..cbe7c20 100644
--- a/charts/cluster-api/templates/NOTES.txt
+++ b/charts/cluster-api/templates/NOTES.txt
@@ -1,3 +1,3 @@
 Cluster API is now Installed!
 
-See https://github.com/eschercloudai/helm-cluster-api#deploying-infrastructure-providers-and-clusters to deploy a cluster.
+See https://github.com/unikorn-cloud/helm-cluster-api#deploying-infrastructure-providers-and-clusters to deploy a cluster.
diff --git a/generate.py b/generate.py
index 7966eaf..d15cfde 100755
--- a/generate.py
+++ b/generate.py
@@ -35,7 +35,7 @@ def main():
         'type': 'application',
         'version': args.version,
         'appVersion': args.app_version,
-        'icon': 'https://raw.githubusercontent.com/eschercloudai/helm-cluster-api/main/icons/default.png',
+        'icon': 'https://assets.unikorn-cloud.org/assets/images/logos/dark-on-light/icon.png',
     }
 
     with open(f'{chart_root}/Chart.yaml', 'w') as out: