diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index b730afb..8374a97 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -190,7 +190,7 @@ jobs:
       - name: Dump debug info
         if: always()
         run: |
-          kubectl -n "$NS" get -o yaml daemonsets,pods,services,roles,rolebindings
+          kubectl -n "$NS" get -o yaml daemonsets,deployments,pods,replicasets,services,roles,rolebindings
           kubectl -n "$NS" get events
           kubectl -n "$NS" logs -l app=basic-metrics --all-containers=true --ignore-errors=true --tail=-1
           kubectl -n "$NS" logs -l app=basic-metrics --all-containers=true --ignore-errors=true --tail=-1 --previous=true
diff --git a/deploy/deployment.yaml.gotpl b/deploy/deployment.yaml.gotpl
index 4e9e233..eadb74f 100644
--- a/deploy/deployment.yaml.gotpl
+++ b/deploy/deployment.yaml.gotpl
@@ -27,35 +27,43 @@ roleRef:
 ---
 {{ end }}
 {{ if .CollectMetrics }}
-apiVersion: v1
-kind: Pod
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: {{ .Name }}-metrics
   labels:
     app: {{ .Name }}-metrics
 spec:
-  containers:
-  - name: aggregator
-    image: {{ .Image }}:{{ .Version }}
-    args:
-    - "aggregate-metrics"
-    - "--debug"
-    ports:
-    - containerPort: 8443
-      name: grpc
-    - containerPort: 8080
-      name: http
-    resources:
-      requests:
-        cpu: "5m"
-        memory: "16Mi"
-      limits:
-        cpu: "100m"
-        memory: "64Mi"
-    securityContext:
-      readOnlyRootFilesystem: true
-      runAsUser: 1000
-      runAsNonRoot: true
+  selector:
+    matchLabels:
+      app: {{ .Name }}-metrics
+  template:
+    metadata:
+      labels:
+        app: {{ .Name }}-metrics
+    spec:
+      containers:
+      - name: aggregator
+        image: {{ .Image }}:{{ .Version }}
+        args:
+        - "aggregate-metrics"
+        - "--debug"
+        ports:
+        - containerPort: 8443
+          name: grpc
+        - containerPort: 8080
+          name: http
+        resources:
+          requests:
+            cpu: "5m"
+            memory: "16Mi"
+          limits:
+            cpu: "100m"
+            memory: "64Mi"
+        securityContext:
+          readOnlyRootFilesystem: true
+          runAsUser: 1000
+          runAsNonRoot: true
 ---
 apiVersion: v1
 kind: Service