diff --git a/Makefile b/Makefile
index 5ac03f6f..6862b75f 100644
--- a/Makefile
+++ b/Makefile
@@ -331,7 +331,7 @@ release: clean-release ## Builds and push container images using the latest git
 	$(MAKE) set-manifest-pull-policy PULL_POLICY=IfNotPresent TARGET_RESOURCE="./config/default/manager_pull_policy.yaml"
 	# Set the control plane manifest image to the production bucket.
 	$(MAKE) set-manifest-image \
-		MANIFEST_IMG=$(PROD_REGISTRY)/$(IMAGE_NAME) MANIFEST_TAG=$(RELEASE_TAG) \
+		MANIFEST_IMG=$(PROD_REGISTRY)/$(CONTROLPLANE_IMAGE_NAME) MANIFEST_TAG=$(RELEASE_TAG) \
 		TARGET_RESOURCE="./controlplane/nested/config/default/manager_image_patch.yaml"
 	$(MAKE) set-manifest-pull-policy PULL_POLICY=IfNotPresent TARGET_RESOURCE="./controlplane/nested/config/default/manager_pull_policy.yaml"
 	## Build the manifests
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 23b85a29..6f63fce4 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -37,3 +37,4 @@ spec:
             cpu: 100m
             memory: 20Mi
       terminationGracePeriodSeconds: 10
+      serviceAccountName: manager
diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/auth_proxy_role_binding.yaml
index 48ed1e4b..136c0b39 100644
--- a/config/rbac/auth_proxy_role_binding.yaml
+++ b/config/rbac/auth_proxy_role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: proxy-role
 subjects:
 - kind: ServiceAccount
-  name: default
+  name: manager
   namespace: system
diff --git a/config/rbac/kustomization.yaml b/config/rbac/kustomization.yaml
index 66c28338..4762a8f5 100644
--- a/config/rbac/kustomization.yaml
+++ b/config/rbac/kustomization.yaml
@@ -1,6 +1,7 @@
 resources:
 - role.yaml
 - role_binding.yaml
+- service_account.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
 # Comment the following 4 lines if you want to disable
diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml
index eed16906..d5e00446 100644
--- a/config/rbac/leader_election_role_binding.yaml
+++ b/config/rbac/leader_election_role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: default
+  name: manager
   namespace: system
diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml
index 8f265870..5a95f66d 100644
--- a/config/rbac/role_binding.yaml
+++ b/config/rbac/role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: manager-role
 subjects:
 - kind: ServiceAccount
-  name: default
+  name: manager
   namespace: system
diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml
new file mode 100644
index 00000000..1fa7074a
--- /dev/null
+++ b/config/rbac/service_account.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: manager
+  namespace: system
\ No newline at end of file
diff --git a/controlplane/nested/config/manager/manager.yaml b/controlplane/nested/config/manager/manager.yaml
index 23b85a29..6f63fce4 100644
--- a/controlplane/nested/config/manager/manager.yaml
+++ b/controlplane/nested/config/manager/manager.yaml
@@ -37,3 +37,4 @@ spec:
             cpu: 100m
             memory: 20Mi
       terminationGracePeriodSeconds: 10
+      serviceAccountName: manager
diff --git a/controlplane/nested/config/rbac/auth_proxy_role_binding.yaml b/controlplane/nested/config/rbac/auth_proxy_role_binding.yaml
index 48ed1e4b..136c0b39 100644
--- a/controlplane/nested/config/rbac/auth_proxy_role_binding.yaml
+++ b/controlplane/nested/config/rbac/auth_proxy_role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: proxy-role
 subjects:
 - kind: ServiceAccount
-  name: default
+  name: manager
   namespace: system
diff --git a/controlplane/nested/config/rbac/kustomization.yaml b/controlplane/nested/config/rbac/kustomization.yaml
index 66c28338..4762a8f5 100644
--- a/controlplane/nested/config/rbac/kustomization.yaml
+++ b/controlplane/nested/config/rbac/kustomization.yaml
@@ -1,6 +1,7 @@
 resources:
 - role.yaml
 - role_binding.yaml
+- service_account.yaml
 - leader_election_role.yaml
 - leader_election_role_binding.yaml
 # Comment the following 4 lines if you want to disable
diff --git a/controlplane/nested/config/rbac/leader_election_role_binding.yaml b/controlplane/nested/config/rbac/leader_election_role_binding.yaml
index eed16906..d5e00446 100644
--- a/controlplane/nested/config/rbac/leader_election_role_binding.yaml
+++ b/controlplane/nested/config/rbac/leader_election_role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: leader-election-role
 subjects:
 - kind: ServiceAccount
-  name: default
+  name: manager
   namespace: system
diff --git a/controlplane/nested/config/rbac/role_binding.yaml b/controlplane/nested/config/rbac/role_binding.yaml
index 8f265870..5a95f66d 100644
--- a/controlplane/nested/config/rbac/role_binding.yaml
+++ b/controlplane/nested/config/rbac/role_binding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: manager-role
 subjects:
 - kind: ServiceAccount
-  name: default
+  name: manager
   namespace: system
diff --git a/controlplane/nested/config/rbac/service_account.yaml b/controlplane/nested/config/rbac/service_account.yaml
new file mode 100644
index 00000000..1fa7074a
--- /dev/null
+++ b/controlplane/nested/config/rbac/service_account.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: manager
+  namespace: system
\ No newline at end of file