diff --git a/kubernetes-manifests/currencyservice.yaml b/kubernetes-manifests/currencyservice.yaml
index fc7911a..4a4dc64 100644
--- a/kubernetes-manifests/currencyservice.yaml
+++ b/kubernetes-manifests/currencyservice.yaml
@@ -8,6 +8,7 @@ spec:
       labels:
         app: currencyservice
     spec:
+      terminationGracePeriodSeconds: 5
       containers:
       - name: server
         image: currencyservice
diff --git a/kubernetes-manifests/emailservice.yaml b/kubernetes-manifests/emailservice.yaml
index 9a4d166..76dbf07 100644
--- a/kubernetes-manifests/emailservice.yaml
+++ b/kubernetes-manifests/emailservice.yaml
@@ -8,6 +8,7 @@ spec:
       labels:
         app: emailservice
     spec:
+      terminationGracePeriodSeconds: 5
       containers:
       - name: server
         image: emailservice
diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml
index 64eb005..a09742e 100644
--- a/kubernetes-manifests/frontend.yaml
+++ b/kubernetes-manifests/frontend.yaml
@@ -18,11 +18,17 @@ spec:
             httpGet:
               path: "/"
               port: 8080
+              httpHeaders:
+              - name: "Cookie"
+                value: "shop_session-id=x-readiness-probe"
           livenessProbe:
             initialDelaySeconds: 10
             httpGet:
               path: "/"
               port: 8080
+              httpHeaders:
+              - name: "Cookie"
+                value: "shop_session-id=x-liveness-probe"
           env:
           - name: PRODUCT_CATALOG_SERVICE_ADDR
             value: "productcatalogservice:3550"
@@ -65,5 +71,5 @@ spec:
   selector:
     app: frontend
   ports:
-  - port: 80
+  - port: 8081
     targetPort: 8080
diff --git a/kubernetes-manifests/paymentservice.yaml b/kubernetes-manifests/paymentservice.yaml
index 8ed2092..d9863c2 100644
--- a/kubernetes-manifests/paymentservice.yaml
+++ b/kubernetes-manifests/paymentservice.yaml
@@ -8,6 +8,7 @@ spec:
       labels:
         app: paymentservice
     spec:
+      terminationGracePeriodSeconds: 5
       containers:
       - name: server
         image: paymentservice
diff --git a/kubernetes-manifests/productcatalogservice.yaml b/kubernetes-manifests/productcatalogservice.yaml
index 2d19b6a..7ceaca8 100644
--- a/kubernetes-manifests/productcatalogservice.yaml
+++ b/kubernetes-manifests/productcatalogservice.yaml
@@ -8,6 +8,7 @@ spec:
       labels:
         app: productcatalogservice
     spec:
+      terminationGracePeriodSeconds: 5
       containers:
       - name: server
         image: productcatalogservice