diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 66a7a5a1e..3eb2f11a8 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -68,6 +68,7 @@ services:
       - UseCustomizationData=True
       - AzureServiceBusEnabled=False
       - CheckUpdateTime=30000
+      - GracePeriodTime=1
     ports:
       - "5102:80"
 
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 83198c760..313811f19 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -66,6 +66,8 @@ services:
       - EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
       - UseCustomizationData=True
       - AzureServiceBusEnabled=False
+      - CheckUpdateTime=30000
+      - GracePeriodTime=1      
     ports:
       - "5102:80"
 
diff --git a/k8s/conf_cloud.yml b/k8s/conf_cloud.yml
index ccf99f0e2..0f079fd3f 100644
--- a/k8s/conf_cloud.yml
+++ b/k8s/conf_cloud.yml
@@ -25,6 +25,8 @@ data:
 # Ordering.API entries
   OrderingBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
   OrderingSqlDb: Ordering SQL SERVER CONNECTION STRING (Server=xxxx;Intial Catalog=yyy;....)
+  GracePeriodManager_GracePeriodTime: "1"
+  GracePeriodManager_CheckUpdateTime: "15000"
 # Payment.API entries
   PaymentBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
 # Global entries
diff --git a/k8s/conf_local.yml b/k8s/conf_local.yml
index 39c5b95cf..00d1c2398 100644
--- a/k8s/conf_local.yml
+++ b/k8s/conf_local.yml
@@ -19,9 +19,11 @@ data:
   MarketingNoSqlDbName: MarketingDb
   MarketingSqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word;
   OrderingBus: rabbitmq
-  GracePeriodManager_GracePeriodTime:"1"
-  GracePeriodManager_CheckUpdateTime:"15000"
   OrderingSqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;
   PaymentBus: rabbitmq
   UseAzureServiceBus: "False"
   keystore: keystore-data
+  GracePeriodManager_GracePeriodTime: "1"
+  GracePeriodManager_CheckUpdateTime: "15000"
+
+
diff --git a/k8s/deployments.yaml b/k8s/deployments.yaml
index e542e8924..9c57826f4 100644
--- a/k8s/deployments.yaml
+++ b/k8s/deployments.yaml
@@ -191,6 +191,16 @@ spec:
            configMapKeyRef:
              name: urls
              key: IdentityUrl
+        - name: CheckUpdateTime
+          valueFrom:
+           configMapKeyRef:
+             name: urls
+             key: GracePeriodManager_CheckUpdateTime
+        - name: GracePeriodTime
+          valueFrom:
+           configMapKeyRef:
+             name: urls
+             key: GracePeriodManager_GracePeriodTime             
         ports:
         - containerPort: 80
       imagePullSecrets: