diff --git a/apps/base/gitlab-runner/pod-cleanup.yaml b/apps/base/gitlab-runner/pod-cleanup.yaml
index a72667111668eef484ebc7254c9eb7c953540762..109cdf9f90e50cc94f171d0a2e5ff46ffb370be8 100644
--- a/apps/base/gitlab-runner/pod-cleanup.yaml
+++ b/apps/base/gitlab-runner/pod-cleanup.yaml
@@ -2,6 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: pod-cleanup-role
+  namespace: gitlab-runner
 rules:
 - apiGroups: [""]
   resources: ["pods"]
@@ -12,6 +13,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: pod-cleanup-role-binding
+  namespace: gitlab-runner
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -19,34 +21,47 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: pod-cleanup-sa
+  namespace: gitlab-runner
 ---
 
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: pod-cleanup-sa
+  namespace: gitlab-runner
 ---
-
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: Deployment
 metadata:
-  name: gitlab-runner-pod-cleanup
+  labels:
+    app.kubernetes.io/name: pod-cleanup
+  name: pod-cleanup
+  namespace: gitlab-runner
 spec:
-  restartPolicy: Always
-  serviceAccountName: pod-cleanup-sa
-  containers:
-  - name: gitlab-runner-pod-cleanup
-    image: registry.gitlab.com/gitlab-org/ci-cd/gitlab-runner-pod-cleanup:latest
-  resources:
-    requests:
-      cpu: 10m
-      memory: 64Mi
-    limits:
-      cpu: 250m
-      memory: 512Mi
-  securityContext:
-    capabilities:
-      drop: ["all"]
-      add: []
-    runAsNonRoot: true
-    runAsUser: 1000
\ No newline at end of file
+  replicas: 2
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: pod-cleanup
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: pod-cleanup
+    spec:
+      restartPolicy: Always
+      serviceAccountName: pod-cleanup-sa
+      containers:
+      - name: gitlab-runner-pod-cleanup
+        image: registry.gitlab.com/gitlab-org/ci-cd/gitlab-runner-pod-cleanup:latest
+      resources:
+        requests:
+          cpu: 10m
+          memory: 64Mi
+        limits:
+          cpu: 250m
+          memory: 512Mi
+      securityContext:
+        capabilities:
+          drop: ["all"]
+          add: []
+        runAsNonRoot: true
+        runAsUser: 1000
\ No newline at end of file