diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst
index ad8bc0b7..bd29360c 100644
--- a/doc/source/configuration/genesis.rst
+++ b/doc/source/configuration/genesis.rst
@@ -41,6 +41,7 @@ Here is a complete sample document:
           - ucp-control-plane=enabled
       images:
         armada: quay.io/airshipit/armada:latest
+        armada-operator: quay.io/airshipit/armada-operator:latest
         kubernetes:
           apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
           controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml
index 3f97c6a5..88c6df56 100644
--- a/examples/basic/Genesis.yaml
+++ b/examples/basic/Genesis.yaml
@@ -45,7 +45,7 @@ data:
     run_as_user: 65534
   images:
     armada: quay.io/airshipit/armada:latest-ubuntu_focal
-    armada-operator: quay.io/raliev12/armada-controller:latest
+    armada-operator: quay.io/airshipit/armada-operator:latest
     kubernetes:
       apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
       controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml
index e5afc724..a21fbccc 100644
--- a/examples/complete/Genesis.yaml
+++ b/examples/complete/Genesis.yaml
@@ -34,7 +34,7 @@ data:
     run_as_user: 65534
   images:
     armada: quay.io/airshipit/armada:latest-ubuntu_focal
-    armada-operator: quay.io/raliev12/armada-controller:latest
+    armada-operator: quay.io/airshipit/armada-operator:latest
     kubernetes:
       apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
       controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index a9bf2c5e..ecefd017 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -1829,6 +1829,7 @@ data:
     images:
       tags:
         api: quay.io/airshipit/armada:latest-ubuntu_focal
+        operator: quay.io/airshipit/armada-operator:latest
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
         ks_endpoints: docker.io/openstackhelm/heat:newton
         ks_service: docker.io/openstackhelm/heat:newton
diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml
index e6ebbb07..c286fc56 100644
--- a/examples/containerd/Genesis.yaml
+++ b/examples/containerd/Genesis.yaml
@@ -45,6 +45,7 @@ data:
     run_as_user: 65534
   images:
     armada: quay.io/airshipit/armada:latest-ubuntu_focal
+    armada-operator: quay.io/airshipit/armada-operator:latest
     kubernetes:
       apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
       controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml
index e6ebbb07..c286fc56 100644
--- a/examples/gate/Genesis.yaml
+++ b/examples/gate/Genesis.yaml
@@ -45,6 +45,7 @@ data:
     run_as_user: 65534
   images:
     armada: quay.io/airshipit/armada:latest-ubuntu_focal
+    armada-operator: quay.io/airshipit/armada-operator:latest
     kubernetes:
       apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
       controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py
index 5144b53b..0f20c7c0 100644
--- a/tests/unit/api/test_validatedesign.py
+++ b/tests/unit/api/test_validatedesign.py
@@ -101,6 +101,7 @@ VALID_DOCS = [
             'n0',
             'images': {
                 'armada': 'quay.io/airshipit/armada:latest-ubuntu_focal',
+                'armada-operator': 'quay.io/airshipit/armada-operator:latest',
                 'kubernetes': {
                     'apiserver':
                     'registry.k8s.io/kube-apiserver-amd64:v1.27.4',
diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml
index b6c7a7ab..91409dd4 100644
--- a/tests/unit/builder_data/simple/Genesis.yaml
+++ b/tests/unit/builder_data/simple/Genesis.yaml
@@ -31,7 +31,7 @@ data:
       - ucp-control-plane=enabled
   images:
     armada: quay.io/airshipit/armada:latest-ubuntu_focal
-    armada-operator: quay.io/raliev12/armada-controller:latest
+    armada-operator: quay.io/airshipit/armada-operator:latest
     kubernetes:
       apiserver: registry.k8s.io/kube-apiserver-amd64:v1.27.4
       controller-manager: registry.k8s.io/kube-controller-manager-amd64:v1.27.4
diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env
index 3d7c51ea..bf82a82a 100644
--- a/tools/gate/default-config-env
+++ b/tools/gate/default-config-env
@@ -1,5 +1,5 @@
 IMAGE_ARMADA=quay.io/airshipit/armada:latest-ubuntu_focal
-IMAGE_ARMADA_OPERATOR=quay.io/raliev12/armada-controller:latest
+IMAGE_ARMADA_OPERATOR=quay.io/airshipit/armada-operator:latest
 IMAGE_CALICO_CNI=quay.io/calico/cni:v3.4.0
 IMAGE_CALICO_CTL=quay.io/calico/ctl:v3.4.0
 IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v3.4.0
diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES
index 26d72ede..9a136bbd 100644
--- a/tools/registry/IMAGES
+++ b/tools/registry/IMAGES
@@ -7,7 +7,7 @@ registry.k8s.io/kube-scheduler-amd64,v1.27.4,scheduler
 registry.k8s.io/kube-proxy-amd64,v1.27.4,proxy
 lachlanevenson/k8s-helm,v3.12.2,helm
 quay.io/airshipit/armada,master,armada
-quay.io/raliev12/armada-controller,latest,armada-operator
+quay.io/airshipit/armada-operator,latest,armada-operator
 quay.io/calico/cni,v3.4.0,calico-cni
 quay.io/calico/ctl,v3.4.0,calico-ctl
 quay.io/calico/kube-controllers,v3.4.0,calico-kube-controllers