diff --git a/k8s/megacosm-dataloader-job.yml b/k8s/megacosm-dataloader-job.yml
index cf76c2b..2ca2413 100644
--- a/k8s/megacosm-dataloader-job.yml
+++ b/k8s/megacosm-dataloader-job.yml
@@ -3,6 +3,9 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: megacosm-dataloader
+  labels:
+    app: megacosm-dataloader
+    tier: job
 spec:
   backoffLimit: 6 # number of retries before throwing error
   activeDeadlineSeconds: 10 # time to allow job to run
@@ -18,11 +21,12 @@ spec:
           image: megacosm-dataloader:latest
           env:
           - name: REDISHOST
-            resourceFieldRef:
-              serviceName: megacosm-redis
-              resource:  medadata.name
+            valueFrom:
+              resourceFieldRef:
+                resource:  medadata.name
           - name: REDISPORT
-            resourceFieldRef:
-              serviceName: megacosm-redis
-              resource: spec.ports.port
+            valueFrom:
+              resourceFieldRef:
+                resource: spec.ports.port
+
 
diff --git a/k8s/megacosm-namespace.yml b/k8s/megacosm-namespace.yml
deleted file mode 100644
index f99d00a..0000000
--- a/k8s/megacosm-namespace.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: megacosm
diff --git a/k8s/megacosm-redis-deployment.yml b/k8s/megacosm-redis-deployment.yml
index f3ad629..34b4b8b 100644
--- a/k8s/megacosm-redis-deployment.yml
+++ b/k8s/megacosm-redis-deployment.yml
@@ -1,23 +1,24 @@
-apiVersion: apps/v1 #  for k8s versions before 1.9.0 use apps/v1beta2  and before 1.8.0 use extensions/v1beta1
-kind: Deployment
+apiVersion: apps/v1
+kind: StatefulSet
 metadata:
   name: megacosm-redis
 spec:
   selector:
     matchLabels:
       app: megacosm-redis
+      tier: backend
+  serviceName: "megacosm-redis"
   replicas: 2
   template:
     metadata:
       labels:
         app: megacosm-redis
+        tier: backend
     spec:
+      terminationGracePeriodSeconds: 10
       containers:
-      - name: megacosm-redis
-        image: morgajel/megacosm-redis  # or just image: redis
-        resources:
-          requests:
-            cpu: 100m
-            memory: 100Mi
-        ports:
-        - containerPort: 6379
\ No newline at end of file
+        - name: megacosm-redis
+          image: morgajel/megacosm-redis
+          ports:
+            - containerPort: 6379
+              name: redis
diff --git a/k8s/megacosm-redis-service.yml b/k8s/megacosm-redis-service.yml
index 3a3f21a..c37980a 100644
--- a/k8s/megacosm-redis-service.yml
+++ b/k8s/megacosm-redis-service.yml
@@ -5,9 +5,12 @@ metadata:
   name: megacosm-redis
   labels:
     app: megacosm-redis
+    tier: backend 
 spec:
+  type: NodePort
   ports:
     - port: 6379
       targetPort: 6379
   selector:
     app: megacosm-redis
+    tier: backend
diff --git a/k8s/megacosm-webapp-deployment.yml b/k8s/megacosm-webapp-deployment.yml
index 71552db..c14d1b4 100644
--- a/k8s/megacosm-webapp-deployment.yml
+++ b/k8s/megacosm-webapp-deployment.yml
@@ -1,21 +1,25 @@
-apiVersion: apps/v1 #  for k8s versions before 1.9.0 use apps/v1beta2  and before 1.8.0 use extensions/v1beta1
-kind: Deployment
+apiVersion: apps/v1
+kind: StatefulSet
 metadata:
   name: megacosm-webapp
 spec:
   selector:
     matchLabels:
       app: megacosm-webapp
+      tier: frontend
+  serviceName: "megacosm-webapp"
   replicas: 2
   template:
     metadata:
       labels:
         app: megacosm-webapp
+        tier: frontend
     spec:
+      terminationGracePeriodSeconds: 10
       containers:
         - name: megacosm-webapp
-          image: morgajel/megacosm-webapp:latest
-          resources:
+          image: morgajel/megacosm-webapp
           ports:
             - containerPort: 8000
+              name: http
 
diff --git a/k8s/megacosm-webapp-service.yml b/k8s/megacosm-webapp-service.yml
index efeae17..9b2db06 100644
--- a/k8s/megacosm-webapp-service.yml
+++ b/k8s/megacosm-webapp-service.yml
@@ -5,9 +5,12 @@ metadata:
   name: megacosm-webapp
   labels:
     app: megacosm-webapp
+    tier: frontend
 spec:
+  type: NodePort
   ports:
     - port: 8000
       targetPort: 8000
   selector:
     app: megacosm-webapp
+    tier: frontend