diff --git a/samples/MicroserviceDemo/k8s/auth-server-deployment.yaml b/samples/MicroserviceDemo/k8s/auth-server-deployment.yaml
index b2307834d2..7ddbc30309 100644
--- a/samples/MicroserviceDemo/k8s/auth-server-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/auth-server-deployment.yaml
@@ -17,19 +17,17 @@ spec:
         - name: ASPNETCORE_ENVIRONMENT
           value: Development
         - name: ASPNETCORE_URLS
-          value: http://0.0.0.0:64999
+          value: http://0.0.0.0:51511
         - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
-            Security=false
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
         - name: RabbitMQ__Connections__Default__HostName
           value: rabbitmq
         - name: Redis__Configuration
           value: redis
-        image: microservice-demo/auth-server:latest
+        image: volosoft/microservice-demo-auth-server
         name: auth-server
         ports:
-        - containerPort: 64999
+        - containerPort: 51511
         resources: {}
-        imagePullPolicy: Never
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/auth-server-service.yaml b/samples/MicroserviceDemo/k8s/auth-server-service.yaml
index c96e9c3e3d..d317ba1fae 100644
--- a/samples/MicroserviceDemo/k8s/auth-server-service.yaml
+++ b/samples/MicroserviceDemo/k8s/auth-server-service.yaml
@@ -6,9 +6,8 @@ metadata:
   name: auth-server
 spec:
   ports:
-  - name: "64999"
-    port: 64999
-    targetPort: 64999
+  - port: 51511
+    targetPort: 51511
   selector:
     io.kompose.service: auth-server
 status:
diff --git a/samples/MicroserviceDemo/k8s/backend-admin-app-deployment.yaml b/samples/MicroserviceDemo/k8s/backend-admin-app-deployment.yaml
index ce6c238f7c..f26cb02806 100644
--- a/samples/MicroserviceDemo/k8s/backend-admin-app-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-deployment.yaml
@@ -19,16 +19,15 @@ spec:
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80
         - name: AuthServer__Authority
-          value: http://auth-server:64999
+          value: http://auth-server:51511
         - name: Redis__Configuration
           value: redis
         - name: RemoteServices__Default__BaseUrl
           value: http://backend-admin-app-gateway/
-        image: microservice-demo/backend-admin-app:latest
+        image: volosoft/microservice-demo-backend-admin-app
         name: backend-admin-app
         ports:
         - containerPort: 80
         resources: {}
-        imagePullPolicy: Never
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-deployment.yaml b/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-deployment.yaml
index 10490961e5..c2f28623b2 100644
--- a/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-deployment.yaml
@@ -19,29 +19,27 @@ spec:
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80
         - name: AuthServer__Authority
-          value: http://auth-server:64999
+          value: http://auth-server:51511
         - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
-            Security=false
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
         - name: GlobalConfiguration__BaseUrl
           value: http://backend-admin-app-gateway
-        - name: ReRoutes__0__DownstreamHostAndPorts__Host
+        - name: ReRoutes__0__DownstreamHostAndPorts__0__Host
           value: identity-service
-        - name: ReRoutes__0__DownstreamHostAndPorts__Port
+        - name: ReRoutes__0__DownstreamHostAndPorts__0__Port
           value: "80"
-        - name: ReRoutes__1__DownstreamHostAndPorts__Host
+        - name: ReRoutes__1__DownstreamHostAndPorts__0__Host
           value: product-service
-        - name: ReRoutes__1__DownstreamHostAndPorts__Port
+        - name: ReRoutes__1__DownstreamHostAndPorts__0__Port
           value: "80"
         - name: Redis__Configuration
           value: redis
         - name: RemoteServices__Default__BaseUrl
           value: http://backend-admin-app-gateway/
-        image: microservice-demo/backend-admin-app-gateway:latest
+        image: volosoft/microservice-demo-backend-admin-app-gateway
         name: backend-admin-app-gateway
         ports:
         - containerPort: 80
         resources: {}
-        imagePullPolicy: Never
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-service.yaml b/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-service.yaml
index ca3faee62c..4864ee547a 100644
--- a/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-service.yaml
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-gateway-service.yaml
@@ -6,8 +6,7 @@ metadata:
   name: backend-admin-app-gateway
 spec:
   ports:
-  - name: "65115"
-    port: 65115
+  - port: 80
     targetPort: 80
   selector:
     io.kompose.service: backend-admin-app-gateway
diff --git a/samples/MicroserviceDemo/k8s/backend-admin-app-service.yaml b/samples/MicroserviceDemo/k8s/backend-admin-app-service.yaml
index f735fdae1c..f8df4e57de 100644
--- a/samples/MicroserviceDemo/k8s/backend-admin-app-service.yaml
+++ b/samples/MicroserviceDemo/k8s/backend-admin-app-service.yaml
@@ -6,8 +6,7 @@ metadata:
   name: backend-admin-app
 spec:
   ports:
-  - name: "3000"
-    port: 3000
+  - port: 80
     targetPort: 80
   selector:
     io.kompose.service: backend-admin-app
diff --git a/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml b/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml
index a5b801106b..6bf8d33a8c 100644
--- a/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/blogging-service-deployment.yaml
@@ -19,21 +19,21 @@ spec:
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80
         - name: AuthServer__Authority
-          value: http://auth-server:64999
+          value: http://auth-server:51511
         - name: ConnectionStrings__Blogging
           value: mongodb://mongodb|MsDemo_Blogging
         - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
-            Security=false
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
         - name: RabbitMQ__Connections__Default__HostName
           value: rabbitmq
         - name: Redis__Configuration
           value: redis
-        image: microservice-demo/blogging-service:latest
+        - name: RemoteServices__Default__BaseUrl
+          value: http://internal-gateway/
+        image: volosoft/microservice-demo-blogging-service
         name: blogging-service
         ports:
         - containerPort: 80
         resources: {}
-        imagePullPolicy: Never
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/blogging-service-service.yaml b/samples/MicroserviceDemo/k8s/blogging-service-service.yaml
index d0ab95528e..c2b359580a 100644
--- a/samples/MicroserviceDemo/k8s/blogging-service-service.yaml
+++ b/samples/MicroserviceDemo/k8s/blogging-service-service.yaml
@@ -6,8 +6,7 @@ metadata:
   name: blogging-service
 spec:
   ports:
-  - name: "62157"
-    port: 62157
+  - port: 80
     targetPort: 80
   selector:
     io.kompose.service: blogging-service
diff --git a/samples/MicroserviceDemo/k8s/console-client-demo-deployment.yaml b/samples/MicroserviceDemo/k8s/console-client-demo-deployment.yaml
deleted file mode 100644
index 4ccfd788be..0000000000
--- a/samples/MicroserviceDemo/k8s/console-client-demo-deployment.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: console-client-demo
-  name: console-client-demo
-spec:
-  replicas: 1
-  strategy: {}
-  template:
-    metadata:
-      labels:
-        io.kompose.service: console-client-demo
-    spec:
-      containers:
-      - env:
-        - name: ASPNETCORE_ENVIRONMENT
-          value: Development
-        - name: ASPNETCORE_URLS
-          value: http://0.0.0.0:80
-        - name: IdentityClients__Default__Authority
-          value: http://auth-server:64999
-        - name: RemoteServices__Default__BaseUrl
-          value: http://internal-gateway/
-        image: microservice-demo/console-client-demo:latest
-        name: console-client-demo
-        ports:
-        - containerPort: 80
-        resources: {}
-        imagePullPolicy: Never
-      restartPolicy: Always
-status: {}
diff --git a/samples/MicroserviceDemo/k8s/console-client-demo-service.yaml b/samples/MicroserviceDemo/k8s/console-client-demo-service.yaml
deleted file mode 100644
index 5146110356..0000000000
--- a/samples/MicroserviceDemo/k8s/console-client-demo-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: console-client-demo
-  name: console-client-demo
-spec:
-  ports:
-  - name: "3001"
-    port: 3001
-    targetPort: 80
-  selector:
-    io.kompose.service: console-client-demo
-status:
-  loadBalancer: {}
diff --git a/samples/MicroserviceDemo/k8s/expose-service.yaml b/samples/MicroserviceDemo/k8s/expose-service.yaml
new file mode 100644
index 0000000000..f7a7e7dfe5
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/expose-service.yaml
@@ -0,0 +1,47 @@
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: auth-server
+  name: auth-server-expose
+spec:
+  type: LoadBalancer
+  selector:
+    io.kompose.service: auth-server
+  ports:
+    - protocol: TCP
+      port: 51511
+      targetPort: 51511
+      nodePort: 30001
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: backend-admin-app
+  name: backend-admin-app-expose
+spec:
+  type: LoadBalancer
+  selector:
+    io.kompose.service: backend-admin-app
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+      nodePort: 30002
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    io.kompose.service: public-website
+  name: public-website-expose
+spec:
+  type: LoadBalancer
+  selector:
+    io.kompose.service: public-website
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
+      nodePort: 30003
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/k8s/identity-service-deployment.yaml b/samples/MicroserviceDemo/k8s/identity-service-deployment.yaml
index 4df2099e49..6179f57e44 100644
--- a/samples/MicroserviceDemo/k8s/identity-service-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/identity-service-deployment.yaml
@@ -19,19 +19,17 @@ spec:
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80
         - name: AuthServer__Authority
-          value: http://auth-server:64999
+          value: http://auth-server:51511
         - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
-            Security=false
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
         - name: RabbitMQ__Connections__Default__HostName
           value: rabbitmq
         - name: Redis__Configuration
           value: redis
-        image: microservice-demo/identity-service:latest
+        image: volosoft/microservice-demo-identity-service
         name: identity-service
         ports:
         - containerPort: 80
         resources: {}
-        imagePullPolicy: Never
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/identity-service-service.yaml b/samples/MicroserviceDemo/k8s/identity-service-service.yaml
index 8c601852a3..994f120b0b 100644
--- a/samples/MicroserviceDemo/k8s/identity-service-service.yaml
+++ b/samples/MicroserviceDemo/k8s/identity-service-service.yaml
@@ -6,8 +6,7 @@ metadata:
   name: identity-service
 spec:
   ports:
-  - name: "63568"
-    port: 63568
+  - port: 80
     targetPort: 80
   selector:
     io.kompose.service: identity-service
diff --git a/samples/MicroserviceDemo/k8s/internal-gateway-deployment.yaml b/samples/MicroserviceDemo/k8s/internal-gateway-deployment.yaml
index 4abd77f1df..9c7edf6cdb 100644
--- a/samples/MicroserviceDemo/k8s/internal-gateway-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/internal-gateway-deployment.yaml
@@ -19,31 +19,29 @@ spec:
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80
         - name: AuthServer__Authority
-          value: http://auth-server:64999
+          value: http://auth-server:51511
         - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
-            Security=false
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
         - name: GlobalConfiguration__BaseUrl
           value: http://internal-gateway
-        - name: ReRoutes__0__DownstreamHostAndPorts__Host
+        - name: ReRoutes__0__DownstreamHostAndPorts__0__Host
           value: identity-service
-        - name: ReRoutes__0__DownstreamHostAndPorts__Port
+        - name: ReRoutes__0__DownstreamHostAndPorts__0__Port
           value: "80"
-        - name: ReRoutes__1__DownstreamHostAndPorts__Host
+        - name: ReRoutes__1__DownstreamHostAndPorts__0__Host
           value: product-service
-        - name: ReRoutes__1__DownstreamHostAndPorts__Port
+        - name: ReRoutes__1__DownstreamHostAndPorts__0__Port
           value: "80"
-        - name: ReRoutes__2__DownstreamHostAndPorts__Host
+        - name: ReRoutes__2__DownstreamHostAndPorts__0__Host
           value: blogging-service
-        - name: ReRoutes__2__DownstreamHostAndPorts__Port
+        - name: ReRoutes__2__DownstreamHostAndPorts__0__Port
           value: "80"
         - name: Redis__Configuration
           value: redis
-        image: microservice-demo/internal-gateway:latest
+        image: volosoft/microservice-demo-internal-gateway
         name: internal-gateway
         ports:
         - containerPort: 80
         resources: {}
-        imagePullPolicy: Never
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/internal-gateway-service.yaml b/samples/MicroserviceDemo/k8s/internal-gateway-service.yaml
index 5b392f5619..e2766c3c3a 100644
--- a/samples/MicroserviceDemo/k8s/internal-gateway-service.yaml
+++ b/samples/MicroserviceDemo/k8s/internal-gateway-service.yaml
@@ -6,8 +6,7 @@ metadata:
   name: internal-gateway
 spec:
   ports:
-  - name: "65129"
-    port: 65129
+  - port: 80
     targetPort: 80
   selector:
     io.kompose.service: internal-gateway
diff --git a/samples/MicroserviceDemo/k8s/migrations-deployment.yaml b/samples/MicroserviceDemo/k8s/migrations-deployment.yaml
deleted file mode 100644
index bae8d1388b..0000000000
--- a/samples/MicroserviceDemo/k8s/migrations-deployment.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: migrations
-  name: migrations
-spec:
-  replicas: 1
-  strategy: {}
-  template:
-    metadata:
-      labels:
-        io.kompose.service: migrations
-    spec:
-      containers:
-      - image: microservice-demo/migrations:latest
-        name: migrations
-        resources: {}
-        imagePullPolicy: Never
-      restartPolicy: Always
-status: {}
diff --git a/samples/MicroserviceDemo/k8s/migrations-job.yaml b/samples/MicroserviceDemo/k8s/migrations-job.yaml
deleted file mode 100644
index 257393379e..0000000000
--- a/samples/MicroserviceDemo/k8s/migrations-job.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: migrations
-spec:
-  template:
-    spec:
-      containers:
-      - image: microservice-demo/migrations:latest
-        name: migrations
-        imagePullPolicy: Never
-      restartPolicy: Never
diff --git a/samples/MicroserviceDemo/k8s/mongodb-deployment.yaml b/samples/MicroserviceDemo/k8s/mongodb-deployment.yaml
index 48617c488c..938af49960 100644
--- a/samples/MicroserviceDemo/k8s/mongodb-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/mongodb-deployment.yaml
@@ -18,6 +18,5 @@ spec:
         ports:
         - containerPort: 27017
         resources: {}
-        imagePullPolicy: IfNotPresent
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/mongodb-service.yaml b/samples/MicroserviceDemo/k8s/mongodb-service.yaml
index 59480974ff..34958fb121 100644
--- a/samples/MicroserviceDemo/k8s/mongodb-service.yaml
+++ b/samples/MicroserviceDemo/k8s/mongodb-service.yaml
@@ -6,8 +6,7 @@ metadata:
   name: mongodb
 spec:
   ports:
-  - name: "27017"
-    port: 27017
+  - port: 27017
     targetPort: 27017
   selector:
     io.kompose.service: mongodb
diff --git a/samples/MicroserviceDemo/k8s/product-service-deployment.yaml b/samples/MicroserviceDemo/k8s/product-service-deployment.yaml
index 5418a8abc7..669de15ae1 100644
--- a/samples/MicroserviceDemo/k8s/product-service-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/product-service-deployment.yaml
@@ -19,22 +19,20 @@ spec:
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80
         - name: AuthServer__Authority
-          value: http://auth-server:64999
+          value: http://auth-server:51511
         - name: ConnectionStrings__Default
           value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
             Security=false
         - name: ConnectionStrings__ProductManagement
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
-            Security=false
+          value: Server=sqlserver;Database=MsDemo_ProductManagement;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
         - name: RabbitMQ__Connections__Default__HostName
           value: rabbitmq
         - name: Redis__Configuration
           value: redis
-        image: microservice-demo/product-service:latest
+        image: volosoft/microservice-demo-product-service
         name: product-service
         ports:
         - containerPort: 80
         resources: {}
-        imagePullPolicy: Never
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/product-service-service.yaml b/samples/MicroserviceDemo/k8s/product-service-service.yaml
index 25b52f9d7c..3c5d1f333b 100644
--- a/samples/MicroserviceDemo/k8s/product-service-service.yaml
+++ b/samples/MicroserviceDemo/k8s/product-service-service.yaml
@@ -6,8 +6,7 @@ metadata:
   name: product-service
 spec:
   ports:
-  - name: "60244"
-    port: 60244
+  - port: 80
     targetPort: 80
   selector:
     io.kompose.service: product-service
diff --git a/samples/MicroserviceDemo/k8s/public-website-deployment.yaml b/samples/MicroserviceDemo/k8s/public-website-deployment.yaml
index 3c8955a99b..c643f68b99 100644
--- a/samples/MicroserviceDemo/k8s/public-website-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/public-website-deployment.yaml
@@ -19,16 +19,15 @@ spec:
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80
         - name: AuthServer__Authority
-          value: http://auth-server:64999
+          value: http://auth-server:51511
         - name: Redis__Configuration
           value: redis
         - name: RemoteServices__Default__BaseUrl
           value: http://public-website-gateway/
-        image: microservice-demo/public-website:latest
+        image: volosoft/microservice-demo-public-website
         name: public-website
         ports:
         - containerPort: 80
         resources: {}
-        imagePullPolicy: Never
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/public-website-gateway-deployment.yaml b/samples/MicroserviceDemo/k8s/public-website-gateway-deployment.yaml
index 9532d9334f..802f12a7e3 100644
--- a/samples/MicroserviceDemo/k8s/public-website-gateway-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/public-website-gateway-deployment.yaml
@@ -19,27 +19,25 @@ spec:
         - name: ASPNETCORE_URLS
           value: http://0.0.0.0:80
         - name: AuthServer__Authority
-          value: http://auth-server:64999
+          value: http://auth-server:51511
         - name: ConnectionStrings__Default
-          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated
-            Security=false
+          value: Server=sqlserver;Database=MsDemo_Identity;Trusted_Connection=True;MultipleActiveResultSets=true;User=sa;Password=yourStrong(!)Password;Integrated Security=false
         - name: GlobalConfiguration__BaseUrl
           value: http://public-website-gateway
-        - name: ReRoutes__0__DownstreamHostAndPorts__Host
+        - name: ReRoutes__0__DownstreamHostAndPorts__0__Host
           value: product-service
-        - name: ReRoutes__0__DownstreamHostAndPorts__Port
+        - name: ReRoutes__0__DownstreamHostAndPorts__0__Port
           value: "80"
-        - name: ReRoutes__1__DownstreamHostAndPorts__Host
+        - name: ReRoutes__1__DownstreamHostAndPorts__0__Host
           value: blogging-service
-        - name: ReRoutes__1__DownstreamHostAndPorts__Port
+        - name: ReRoutes__1__DownstreamHostAndPorts__0__Port
           value: "80"
         - name: Redis__Configuration
           value: redis
-        image: microservice-demo/public-website-gateway:latest
+        image: volosoft/microservice-demo-public-website-gateway
         name: public-website-gateway
         ports:
         - containerPort: 80
         resources: {}
-        imagePullPolicy: Never
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/public-website-gateway-service.yaml b/samples/MicroserviceDemo/k8s/public-website-gateway-service.yaml
index 4c007686b7..5ab4e428b9 100644
--- a/samples/MicroserviceDemo/k8s/public-website-gateway-service.yaml
+++ b/samples/MicroserviceDemo/k8s/public-website-gateway-service.yaml
@@ -6,8 +6,7 @@ metadata:
   name: public-website-gateway
 spec:
   ports:
-  - name: "64897"
-    port: 64897
+  - port: 80
     targetPort: 80
   selector:
     io.kompose.service: public-website-gateway
diff --git a/samples/MicroserviceDemo/k8s/public-website-service.yaml b/samples/MicroserviceDemo/k8s/public-website-service.yaml
index 77fac13ac3..5f5c4f56d9 100644
--- a/samples/MicroserviceDemo/k8s/public-website-service.yaml
+++ b/samples/MicroserviceDemo/k8s/public-website-service.yaml
@@ -6,8 +6,7 @@ metadata:
   name: public-website
 spec:
   ports:
-  - name: "3002"
-    port: 3002
+  - port: 80
     targetPort: 80
   selector:
     io.kompose.service: public-website
diff --git a/samples/MicroserviceDemo/k8s/rabbitmq-deployment.yaml b/samples/MicroserviceDemo/k8s/rabbitmq-deployment.yaml
index 5f32e398c1..e455bebac6 100644
--- a/samples/MicroserviceDemo/k8s/rabbitmq-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/rabbitmq-deployment.yaml
@@ -19,6 +19,5 @@ spec:
         - containerPort: 5672
         - containerPort: 15672
         resources: {}
-        imagePullPolicy: IfNotPresent
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/redis-deployment.yaml b/samples/MicroserviceDemo/k8s/redis-deployment.yaml
index b4389df699..35d9973110 100644
--- a/samples/MicroserviceDemo/k8s/redis-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/redis-deployment.yaml
@@ -18,6 +18,5 @@ spec:
         ports:
         - containerPort: 6379
         resources: {}
-        imagePullPolicy: IfNotPresent
       restartPolicy: Always
 status: {}
diff --git a/samples/MicroserviceDemo/k8s/redis-service.yaml b/samples/MicroserviceDemo/k8s/redis-service.yaml
index 702eaab08c..8ef5014d20 100644
--- a/samples/MicroserviceDemo/k8s/redis-service.yaml
+++ b/samples/MicroserviceDemo/k8s/redis-service.yaml
@@ -6,8 +6,7 @@ metadata:
   name: redis
 spec:
   ports:
-  - name: "6379"
-    port: 6379
+  - port: 6379
     targetPort: 6379
   selector:
     io.kompose.service: redis
diff --git a/samples/MicroserviceDemo/k8s/restore-database-job.yaml b/samples/MicroserviceDemo/k8s/restore-database-job.yaml
new file mode 100644
index 0000000000..b35b67844f
--- /dev/null
+++ b/samples/MicroserviceDemo/k8s/restore-database-job.yaml
@@ -0,0 +1,23 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: restore-database
+spec:
+  template:
+    metadata:
+      name: restore-database
+    spec:
+      containers:
+      - env:
+        - name: SA_PASSWORD
+          value: yourStrong(!)Password
+        name: restore-database
+        image: volosoft/microservice-demo-restore-database
+        volumeMounts:
+        - mountPath: /var/opt/mssql
+          name: dbdata
+      volumes:
+      - name: dbdata
+        persistentVolumeClaim:
+          claimName: dbdata
+      restartPolicy: Never
\ No newline at end of file
diff --git a/samples/MicroserviceDemo/k8s/sqlserver-deployment.yaml b/samples/MicroserviceDemo/k8s/sqlserver-deployment.yaml
index 568f29ab4d..1de273530e 100644
--- a/samples/MicroserviceDemo/k8s/sqlserver-deployment.yaml
+++ b/samples/MicroserviceDemo/k8s/sqlserver-deployment.yaml
@@ -24,7 +24,6 @@ spec:
         ports:
         - containerPort: 1433
         resources: {}
-        imagePullPolicy: IfNotPresent
         volumeMounts:
         - mountPath: /var/opt/mssql
           name: dbdata
diff --git a/samples/MicroserviceDemo/k8s/sqlserver-service.yaml b/samples/MicroserviceDemo/k8s/sqlserver-service.yaml
index 57e77a1b42..da4a98c85a 100644
--- a/samples/MicroserviceDemo/k8s/sqlserver-service.yaml
+++ b/samples/MicroserviceDemo/k8s/sqlserver-service.yaml
@@ -6,8 +6,7 @@ metadata:
   name: sqlserver
 spec:
   ports:
-  - name: "1433"
-    port: 1433
+  - port: 1433
     targetPort: 1433
   selector:
     io.kompose.service: sqlserver