diff --git a/3-tier-app/emp-api/spring-boot-api-deployment.yml b/3-tier-app/emp-api/spring-boot-api-deployment.yml
new file mode 100644
index 0000000..537ce0e
--- /dev/null
+++ b/3-tier-app/emp-api/spring-boot-api-deployment.yml
@@ -0,0 +1,21 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: emp-api
+  labels:
+    app: emp-api
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: emp-api
+  template:
+    metadata:
+      labels:
+        app: emp-api
+    spec:
+      containers:
+      - name: emp-api
+        image: kammana/boot-api:5.0
+        ports:
+        - containerPort: 8080
diff --git a/mongodb/spring-boot-api-service.yml b/3-tier-app/emp-api/spring-boot-api-service.yml
similarity index 100%
rename from mongodb/spring-boot-api-service.yml
rename to 3-tier-app/emp-api/spring-boot-api-service.yml
diff --git a/mongodb/spring-boot-api.yml b/3-tier-app/emp-api/spring-boot-api.yml
similarity index 100%
rename from mongodb/spring-boot-api.yml
rename to 3-tier-app/emp-api/spring-boot-api.yml
diff --git a/3-tier-app/emp-fe/emp-fe-deployment.yml b/3-tier-app/emp-fe/emp-fe-deployment.yml
new file mode 100644
index 0000000..997603f
--- /dev/null
+++ b/3-tier-app/emp-fe/emp-fe-deployment.yml
@@ -0,0 +1,21 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: emp-fe   
+  labels:
+    app: emp-fe
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: emp-fe
+  template:
+    metadata:
+      labels:
+        app: emp-fe
+    spec:
+      containers:
+      - name: emp-fe
+        image: kammana/emp-fe:1.0
+        ports:
+        - containerPort: 4200
diff --git a/3-tier-app/emp-fe/emp-fe-service.yml b/3-tier-app/emp-fe/emp-fe-service.yml
new file mode 100644
index 0000000..a43b517
--- /dev/null
+++ b/3-tier-app/emp-fe/emp-fe-service.yml
@@ -0,0 +1,12 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: emp-fe
+spec:
+  selector:
+    app: emp-fe
+  ports:
+  - protocol: TCP
+    port: 80
+    targetPort: 4200
+  type: NodePort
diff --git a/3-tier-app/mongo/mongo-pv-pvc.yml b/3-tier-app/mongo/mongo-pv-pvc.yml
new file mode 100644
index 0000000..d483ead
--- /dev/null
+++ b/3-tier-app/mongo/mongo-pv-pvc.yml
@@ -0,0 +1,26 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: mongo-pv-volume
+  labels:
+    type: local
+spec:
+  storageClassName: manual
+  capacity:
+    storage: 20Gi
+  accessModes:
+    - ReadWriteOnce
+  hostPath:
+    path: "/data/db"
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: mongo-pv-claim
+spec:
+  storageClassName: manual
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 20Gi
diff --git a/3-tier-app/mongo/mongo-svc-deployment.yml b/3-tier-app/mongo/mongo-svc-deployment.yml
new file mode 100644
index 0000000..6192399
--- /dev/null
+++ b/3-tier-app/mongo/mongo-svc-deployment.yml
@@ -0,0 +1,39 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mongodb
+spec:
+  ports:
+  - port: 27017
+  selector:
+    app: mongo
+  clusterIP: None
+---
+apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
+kind: Deployment
+metadata:
+  name: mongo
+spec:
+  selector:
+    matchLabels:
+      app: mongo
+  strategy:
+    type: Recreate
+  template:
+    metadata:
+      labels:
+        app: mongo
+    spec:
+      containers:
+      - image: mongo:latest
+        name: mongo
+        ports:
+        - containerPort: 27017
+          name: mongo
+        volumeMounts:
+        - name: mongo-persistent-storage
+          mountPath: /data/db
+      volumes:
+      - name: mongo-persistent-storage
+        persistentVolumeClaim:
+          claimName: mongo-pv-claim
diff --git a/mongodb/mongo-service.yml b/mongodb/mongo-service.yml
deleted file mode 100644
index e98a01b..0000000
--- a/mongodb/mongo-service.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-kind: Service
-apiVersion: v1
-metadata:
-  name: mongodb
-spec:
-  selector:
-    app: mongodb
-  ports:
-  - protocol: TCP
-    port: 27017
-    targetPort: 27017
-  type: ClusterIp   
diff --git a/mongodb/mongodb.yml b/mongodb/mongodb.yml
deleted file mode 100644
index 783d0f9..0000000
--- a/mongodb/mongodb.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: mongodb
-spec:
-  replicas: 1
-  selector:
-    app: mongodb
-  template:
-    metadata:
-      name: mongodb
-      labels:
-        app: mongodb
-    spec:
-      containers:
-      - name: mongodb
-        image: mongo
-        ports:
-        - containerPort: 27017
-        volumeMounts:
-        - name: mongodb-persistent
-          mountPath: /data/db
-      volumes:
-        - name: mongodb-persistent
-          # This AWS EBS volume must already exist.
-          awsElasticBlockStore:
-            volumeID: vol-0fc7b9dab97f692c4
-            fsType: ext4