diff --git a/docker-compose.images.yml b/docker-compose.images.yml
index 8909aae794..32f22cb8a2 100644
--- a/docker-compose.images.yml
+++ b/docker-compose.images.yml
@@ -11,7 +11,7 @@ services:
       redis:
         condition: service_healthy 
     ports:
-      - "8080:80"
+      - "8086:80"
     networks:
       - front-tier
       - back-tier
diff --git a/docker-compose.yml b/docker-compose.yml
index 5915ffd741..615a0326d7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,7 @@
 # version is now using "compose spec"
 # v2 and v3 are now combined!
 # docker-compose v1.27+ required
+## testing webhook
 
 services:
   vote:
diff --git a/docker-stack.yml b/docker-stack.yml
index 356b944caf..a0df23c432 100644
--- a/docker-stack.yml
+++ b/docker-stack.yml
@@ -24,7 +24,7 @@ services:
   vote:
     image: dockersamples/examplevotingapp_vote
     ports:
-      - 8080:80
+      - 8086:80
     networks:
       - frontend
     deploy:
diff --git a/k8s-specifications/db-deployment.yaml b/k8s-specifications/db-deployment.yaml
index bc94ca7368..c3faf210db 100644
--- a/k8s-specifications/db-deployment.yaml
+++ b/k8s-specifications/db-deployment.yaml
@@ -1,6 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: voting-app
   labels:
     app: db
   name: db
diff --git a/k8s-specifications/db-service.yaml b/k8s-specifications/db-service.yaml
index 104f1e8268..eee3ab0d3b 100644
--- a/k8s-specifications/db-service.yaml
+++ b/k8s-specifications/db-service.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: voting-app
   labels:
     app: db
   name: db
diff --git a/k8s-specifications/redis-deployment.yaml b/k8s-specifications/redis-deployment.yaml
index 24aa52135f..15c4a77a66 100644
--- a/k8s-specifications/redis-deployment.yaml
+++ b/k8s-specifications/redis-deployment.yaml
@@ -1,6 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: voting-app
   labels:
     app: redis
   name: redis
diff --git a/k8s-specifications/redis-service.yaml b/k8s-specifications/redis-service.yaml
index 809d31d875..6996f1ae32 100644
--- a/k8s-specifications/redis-service.yaml
+++ b/k8s-specifications/redis-service.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: voting-app
   labels:
     app: redis
   name: redis
diff --git a/k8s-specifications/result-deployment.yaml b/k8s-specifications/result-deployment.yaml
index b85488a667..d29c7dd04a 100644
--- a/k8s-specifications/result-deployment.yaml
+++ b/k8s-specifications/result-deployment.yaml
@@ -1,6 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: voting-app
   labels:
     app: result
   name: result
diff --git a/k8s-specifications/result-service.yaml b/k8s-specifications/result-service.yaml
index 0fed5e0cc5..169f6851e7 100644
--- a/k8s-specifications/result-service.yaml
+++ b/k8s-specifications/result-service.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: voting-app
   labels:
     app: result
   name: result
diff --git a/k8s-specifications/vote-deployment.yaml b/k8s-specifications/vote-deployment.yaml
index 165a9478f8..518c6092fd 100644
--- a/k8s-specifications/vote-deployment.yaml
+++ b/k8s-specifications/vote-deployment.yaml
@@ -1,6 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: voting-app
   labels:
     app: vote
   name: vote
diff --git a/k8s-specifications/vote-service.yaml b/k8s-specifications/vote-service.yaml
index d7a05b5513..9ce84eeddf 100644
--- a/k8s-specifications/vote-service.yaml
+++ b/k8s-specifications/vote-service.yaml
@@ -1,6 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
+  namespace: voting-app
   labels:
     app: vote
   name: vote
@@ -8,7 +9,7 @@ spec:
   type: NodePort
   ports:
   - name: "vote-service"
-    port: 8080
+    port: 8086
     targetPort: 80
     nodePort: 31000
   selector:
diff --git a/k8s-specifications/voting-app.yml b/k8s-specifications/voting-app.yml
new file mode 100644
index 0000000000..2f9d85cffd
--- /dev/null
+++ b/k8s-specifications/voting-app.yml
@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: Namespace
+
+metadata:
+  name: voting-app
diff --git a/k8s-specifications/worker-deployment.yaml b/k8s-specifications/worker-deployment.yaml
index 9e35450aec..71d2bd4369 100644
--- a/k8s-specifications/worker-deployment.yaml
+++ b/k8s-specifications/worker-deployment.yaml
@@ -1,6 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
+  namespace: voting-app
   labels:
     app: worker
   name: worker