diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml
index 404f9df0..0a7ace83 100644
--- a/.github/workflows/build_and_publish.yml
+++ b/.github/workflows/build_and_publish.yml
@@ -24,8 +24,8 @@ jobs:
         with:
           # list of Docker images to use as base name for tags
           images: |
-            amazeeio/lagoon-builddeploy
-            ghcr.io/amazeeio/lagoon-builddeploy
+            uselagoon/remote-controller
+            ghcr.io/uselagoon/remote-controller
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
diff --git a/.github/workflows/remote-controller.yaml b/.github/workflows/remote-controller.yaml
index a4ded3d0..17e1228b 100644
--- a/.github/workflows/remote-controller.yaml
+++ b/.github/workflows/remote-controller.yaml
@@ -47,7 +47,7 @@ jobs:
     - name: Create kind cluster
       uses: helm/kind-action@v1.2.0
       with:
-        node_image: kindest/node:v1.21.1
+        node_image: kindest/node:v1.22.0
         config: test-resources/kind-config.yaml
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
@@ -56,7 +56,7 @@ jobs:
       with:
         context: .
         load: true
-        tags: amazeeio/lagoon-builddeploy:test-tag
+        tags: uselagoon/remote-controller:test-tag
     - name: Run Tests
       run: |
         export PATH=$PATH:/usr/local/kubebuilder/bin
diff --git a/config/crd/bases/lagoon.amazee.io_lagoonbuilds.yaml b/config/crd/bases/lagoon.amazee.io_lagoonbuilds.yaml
index 6da605e5..94515bf0 100644
--- a/config/crd/bases/lagoon.amazee.io_lagoonbuilds.yaml
+++ b/config/crd/bases/lagoon.amazee.io_lagoonbuilds.yaml
@@ -216,6 +216,8 @@ spec:
                         type: string
                       buildPhase:
                         type: string
+                      clusterName:
+                        type: string
                       endTime:
                         type: string
                       environment:
@@ -299,6 +301,8 @@ spec:
                         type: string
                       buildPhase:
                         type: string
+                      clusterName:
+                        type: string
                       endTime:
                         type: string
                       environment:
@@ -384,6 +388,8 @@ spec:
                         type: string
                       buildPhase:
                         type: string
+                      clusterName:
+                        type: string
                       endTime:
                         type: string
                       environment:
diff --git a/config/crd/bases/lagoon.amazee.io_lagoontasks.yaml b/config/crd/bases/lagoon.amazee.io_lagoontasks.yaml
index 3c6c203c..c5a289e8 100644
--- a/config/crd/bases/lagoon.amazee.io_lagoontasks.yaml
+++ b/config/crd/bases/lagoon.amazee.io_lagoontasks.yaml
@@ -184,6 +184,8 @@ spec:
                         type: string
                       buildPhase:
                         type: string
+                      clusterName:
+                        type: string
                       endTime:
                         type: string
                       environment:
@@ -267,6 +269,8 @@ spec:
                         type: string
                       buildPhase:
                         type: string
+                      clusterName:
+                        type: string
                       endTime:
                         type: string
                       environment:
@@ -352,6 +356,8 @@ spec:
                         type: string
                       buildPhase:
                         type: string
+                      clusterName:
+                        type: string
                       endTime:
                         type: string
                       environment:
diff --git a/controllers/lagoonbuild_deletionhandlers.go b/controllers/lagoonbuild_deletionhandlers.go
index f372bef0..a94fb5b4 100644
--- a/controllers/lagoonbuild_deletionhandlers.go
+++ b/controllers/lagoonbuild_deletionhandlers.go
@@ -239,7 +239,7 @@ func (r *LagoonBuildReconciler) cancelledBuildLogsToLagoonLogs(ctx context.Conte
 				BuildPhase: condition,
 				RemoteID:   string(lagoonBuild.ObjectMeta.UID),
 				LogLink:    lagoonBuild.Spec.Project.UILink,
-				Cluster:     r.LagoonTargetName,
+				Cluster:    r.LagoonTargetName,
 			},
 		}
 		// add the actual build log message