diff --git a/dockerfiles/Dockerfile_3 b/dockerfiles/poi.Dockerfile
similarity index 100%
rename from dockerfiles/Dockerfile_3
rename to dockerfiles/poi.Dockerfile
diff --git a/dockerfiles/Dockerfile_4 b/dockerfiles/trips.Dockerfile
similarity index 100%
rename from dockerfiles/Dockerfile_4
rename to dockerfiles/trips.Dockerfile
diff --git a/dockerfiles/Dockerfile_1 b/dockerfiles/tripviewer.Dockerfile
similarity index 100%
rename from dockerfiles/Dockerfile_1
rename to dockerfiles/tripviewer.Dockerfile
diff --git a/dockerfiles/Dockerfile_0 b/dockerfiles/user-java.Dockerfile
similarity index 100%
rename from dockerfiles/Dockerfile_0
rename to dockerfiles/user-java.Dockerfile
diff --git a/dockerfiles/Dockerfile_2 b/dockerfiles/userprofile.Dockerfile
similarity index 100%
rename from dockerfiles/Dockerfile_2
rename to dockerfiles/userprofile.Dockerfile
diff --git a/kube-conf/poi-service.yaml b/kube-conf/poi-service.yaml
new file mode 100644
index 00000000..205576b0
--- /dev/null
+++ b/kube-conf/poi-service.yaml
@@ -0,0 +1,44 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: poi-deployment
+  labels:
+    app: poi
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: poi
+  template:
+    metadata:
+      labels:
+        app: poi
+    spec:
+      containers:
+      - name: poi
+        image: registryanm5076.azurecr.io/poi:latest
+        ports:
+        - containerPort: 80
+        env:
+        - name: SQL_USER
+          value: "sqladminaNm5076"
+        - name: SQL_PASSWORD
+          value: "tP4rd6Zs3"
+        - name: SQL_SERVER
+          value: "sqlserveranm5076.database.windows.net"
+        - name: SQL_DBNAME
+          value: "mydrivingDB"
+        - name: ASPNETCORE_ENVIRONMENT
+          value: "Development"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: poi-service
+spec:
+  selector:
+    app: poi
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
diff --git a/kube-conf/tripviewer-service.yaml b/kube-conf/tripviewer-service.yaml
new file mode 100644
index 00000000..c85a913b
--- /dev/null
+++ b/kube-conf/tripviewer-service.yaml
@@ -0,0 +1,38 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: tripviewer-deployment
+  labels:
+    app: tripviewer
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: tripviewer
+  template:
+    metadata:
+      labels:
+        app: tripviewer
+    spec:
+      containers:
+      - name: poi
+        image: registryanm5076.azurecr.io/tripviewer:latest
+        ports:
+        - containerPort: 80
+        env:
+        - name: TRIPS_API_ENDPOINT
+          value: "http://trips-service"
+        - name: USERPROFILE_API_ENDPOINT
+          value: "http://userprofile-service"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: tripviewer-service
+spec:
+  selector:
+    app: tripviewer
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
diff --git a/kube-conf/user-java-service.yaml b/kube-conf/user-java-service.yaml
new file mode 100644
index 00000000..ec0a425c
--- /dev/null
+++ b/kube-conf/user-java-service.yaml
@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: user-java-deployment
+  labels:
+    app: user-java
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: user-java
+  template:
+    metadata:
+      labels:
+        app: user-java
+    spec:
+      containers:
+      - name: poi
+        image: registryanm5076.azurecr.io/user-java:latest
+        ports:
+        - containerPort: 80
+        env:
+        - name: SQL_USER
+          value: "sqladminaNm5076"
+        - name: SQL_PASSWORD
+          value: "tP4rd6Zs3"
+        - name: SQL_SERVER
+          value: "sqlserveranm5076.database.windows.net"
+        - name: SQL_DBNAME
+          value: "mydrivingDB"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: user-java-service
+spec:
+  selector:
+    app: user-java
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80
diff --git a/kube-conf/userprofile-service.yaml b/kube-conf/userprofile-service.yaml
new file mode 100644
index 00000000..d189edec
--- /dev/null
+++ b/kube-conf/userprofile-service.yaml
@@ -0,0 +1,42 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: userprofile-deployment
+  labels:
+    app: userprofile
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: userprofile
+  template:
+    metadata:
+      labels:
+        app: userprofile
+    spec:
+      containers:
+      - name: userprofile
+        image: registryanm5076.azurecr.io/userprofile:latest
+        ports:
+        - containerPort: 80
+        env:
+        - name: SQL_USER
+          value: "sqladminaNm5076"
+        - name: SQL_PASSWORD
+          value: "tP4rd6Zs3"
+        - name: SQL_SERVER
+          value: "sqlserveranm5076.database.windows.net"
+        - name: SQL_DBNAME
+          value: "mydrivingDB"
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: userprofile-service
+spec:
+  selector:
+    app: userprofile
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 80