diff --git a/src/k8s/base/deployment.yml b/src/k8s/base/deployment.yml
index c88d6c83261a1da550847a9e7116f548f519113d..dbffee0dfc51c77a7b8871464c4ead2d1d76ce48 100644
--- a/src/k8s/base/deployment.yml
+++ b/src/k8s/base/deployment.yml
@@ -2,18 +2,16 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: submission-code-server-deployment
-  namespace: submission-code
   labels:
-    app: submission-code # do not delete, used for billing
+    app: submission-code
 spec:
-  revisionHistoryLimit: 1
   selector:
     matchLabels:
       app: submission-code-server
   template:
     metadata:
       labels:
-        app: submission-code-server # Bind by service selector>app:
+        app: submission-code-server
     spec:
       containers:
         - name: submission-app
@@ -46,6 +44,6 @@ spec:
             - name: SPRING_FLYWAY_BASELINE_VERSION
               value: "0"
       nodeSelector:
-        cce.cloud.com/cce-nodepool: "caascad-inttac-ju-pod-tac-dashing-boa"
+        caascad.io/nodepool: "pod-tac"
       imagePullSecrets:
         - name: poc-inttac-poc-img-push-pull-secret
diff --git a/src/k8s/base/kustomization.yml b/src/k8s/base/kustomization.yml
index 68074df3dd84991446edf8a85855fcc6e596cd0f..4925c2c0c0148b18808ee184aa2bb2e0579bb5a7 100644
--- a/src/k8s/base/kustomization.yml
+++ b/src/k8s/base/kustomization.yml
@@ -1,5 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: submission-code
 resources:
   - deployment.yml
   - service.yml
diff --git a/src/k8s/base/service.yml b/src/k8s/base/service.yml
index f2ae904d45af28aa25aeba07a0c1bf297d9df1b2..c836f150ab037f0b6a68ffcd79d635782d6392b3 100644
--- a/src/k8s/base/service.yml
+++ b/src/k8s/base/service.yml
@@ -2,13 +2,12 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    app: submission-code # do not delete, used for billing
-  name: submission-code-server-service # Service name
-  namespace: submission-code
+    app: submission-code
+  name: submission-code-server-service
 spec:
   type: NodePort
   selector:
-    app: submission-code-server # Defines app that will be targeted
+    app: submission-code-server
   ports:
     - port: 80
       targetPort: 8080