diff --git a/k8s/local/auth/deployment.yaml b/k8s/local/auth/deployment.yaml
index 93ffc05a..dc9b6a96 100644
--- a/k8s/local/auth/deployment.yaml
+++ b/k8s/local/auth/deployment.yaml
@@ -2,19 +2,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: auth
-  name: auth
+    app: auth-label
+  name: auth-deployment
   namespace: chicmoz
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: auth
+      app: auth-label
   strategy: {}
   template:
     metadata:
       labels:
-        app: auth
+        app: auth-label
     spec:
       containers:
         - image: auth:latest
@@ -23,7 +23,7 @@ spec:
               memory: 500Mi
               cpu: 50m
           ports:
-            - name: http-app
+            - name: http-app-port
               containerPort: 80
               protocol: TCP
           name: auth
diff --git a/k8s/local/auth/postgres-config.yaml b/k8s/local/auth/postgres-config.yaml
index 13bce500..b02bbff0 100644
--- a/k8s/local/auth/postgres-config.yaml
+++ b/k8s/local/auth/postgres-config.yaml
@@ -5,4 +5,3 @@ metadata:
   namespace: chicmoz
 data:
   POSTGRES_DB_NAME: "auth"
-  POSTGRES_PASSWORD: "secret-local-password"
diff --git a/k8s/local/auth/service.yaml b/k8s/local/auth/service.yaml
index 93752a19..9b93f57b 100644
--- a/k8s/local/auth/service.yaml
+++ b/k8s/local/auth/service.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: auth
+  name: auth-service
   namespace: chicmoz
 spec:
   selector:
-    app: auth
+    app: auth-label
   ports:
     - name: http-app
       protocol: TCP
       port: 80
-      targetPort: http-app
+      targetPort: http-app-port
diff --git a/k8s/local/auth/image.yaml b/k8s/local/auth/skaffold.yaml
similarity index 64%
rename from k8s/local/auth/image.yaml
rename to k8s/local/auth/skaffold.yaml
index 6f82f9ef..c8e7eb7d 100644
--- a/k8s/local/auth/image.yaml
+++ b/k8s/local/auth/skaffold.yaml
@@ -11,3 +11,12 @@ build:
       requires:
         - image: chicmoz-base
           alias: BASE
+deploy:
+  kubectl:
+    flags:
+      apply: ["--force"]
+manifests:
+  rawYaml:
+    - ./postgres-config.yaml
+    - ./service.yaml
+    - ./deployment.yaml
diff --git a/k8s/local/event-cannon/deployment.yaml b/k8s/local/event-cannon/deployment.yaml
index 8e7b8724..ae5baf4c 100644
--- a/k8s/local/event-cannon/deployment.yaml
+++ b/k8s/local/event-cannon/deployment.yaml
@@ -2,19 +2,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: event-cannon
-  name: event-cannon
+    app: event-cannon-label
+  name: event-cannon-deployment
   namespace: chicmoz
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: event-cannon
+      app: event-cannon-label
   strategy: {}
   template:
     metadata:
       labels:
-        app: event-cannon
+        app: event-cannon-label
     spec:
       containers:
         - image: event-cannon:latest
@@ -24,8 +24,6 @@ spec:
               cpu: 250m
           name: event-cannon
           env:
-            - name: NODE_ENV
-              value: "development"
             - name: AZTEC_RPC_URL
               value: "http://aztec-sandbox-node:8081"
             - name: ETHEREUM_RPC_URL
diff --git a/k8s/local/event-cannon/image.yaml b/k8s/local/event-cannon/skaffold.yaml
similarity index 74%
rename from k8s/local/event-cannon/image.yaml
rename to k8s/local/event-cannon/skaffold.yaml
index bf26d26f..3a7c0d1a 100644
--- a/k8s/local/event-cannon/image.yaml
+++ b/k8s/local/event-cannon/skaffold.yaml
@@ -11,3 +11,10 @@ build:
       requires:
         - image: chicmoz-base
           alias: BASE
+deploy:
+  kubectl:
+    flags:
+      apply: ["--force"]
+manifests:
+  rawYaml:
+    - ./deployment.yaml
diff --git a/k8s/local/skaffold.no_ui.yaml b/k8s/local/skaffold.no_ui.yaml
index 85a8260b..db4cf676 100644
--- a/k8s/local/skaffold.no_ui.yaml
+++ b/k8s/local/skaffold.no_ui.yaml
@@ -5,19 +5,9 @@ metadata:
 requires:
   - path: ./common/skaffold.manifests.yaml
   - path: ./common/skaffold.aztec_sanbox_nodes.yaml
-  - path: ./auth/image.yaml
-  - path: ./event-cannon/image.yaml
   - path: ./aztec-listener/skaffold.sandbox.yaml
   - path: ./ethereum-listener/skaffold.sandbox.yaml
   - path: ./explorer-api/skaffold.sandbox.yaml
+  - path: ./auth/skaffold.yaml
+  - path: ./event-cannon/skaffold.yaml
   - path: ./websocket-event-publisher/skaffold.sandbox.yaml
-deploy:
-  kubectl:
-    flags:
-      apply: ["--force"]
-manifests:
-  rawYaml:
-    - ./auth/deployment.yaml
-    - ./auth/service.yaml
-    - ./auth/postgres-config.yaml
-    - ./event-cannon/deployment.yaml
diff --git a/k8s/local/skaffold.sp_testnet.yaml b/k8s/local/skaffold.sp_testnet.yaml
index 0e07bf64..036d6838 100644
--- a/k8s/local/skaffold.sp_testnet.yaml
+++ b/k8s/local/skaffold.sp_testnet.yaml
@@ -5,18 +5,9 @@ metadata:
 requires:
   - path: ./common/skaffold.manifests.yaml
   - path: ./common/skaffold.aztec_sanbox_nodes.yaml
-  - path: ./auth/image.yaml
   - path: ./aztec-listener/skaffold.sp_testnet.yaml
   - path: ./explorer-ui/skaffold.sp_testnet.yaml
   - path: ./ethereum-listener/skaffold.sp_testnet.yaml
   - path: ./explorer-api/skaffold.sp_testnet.yaml
+  - path: ./auth/skaffold.yaml
   - path: ./websocket-event-publisher/skaffold.sp_testnet.yaml
-deploy:
-  kubectl:
-    flags:
-      apply: ["--force"]
-manifests:
-  rawYaml:
-    - ./auth/deployment.yaml
-    - ./auth/service.yaml
-    - ./auth/postgres-config.yaml