diff --git a/cli-windows/build-bits.ps1 b/cli-windows/build-bits.ps1
index 26651da5b..272227b3d 100644
--- a/cli-windows/build-bits.ps1
+++ b/cli-windows/build-bits.ps1
@@ -14,7 +14,11 @@ $projectPaths =
     @{Path="$rootPath\src\Services\Identity\Identity.API";Prj="Identity.API.csproj"},
     @{Path="$rootPath\src\Services\Catalog\Catalog.API";Prj="Catalog.API.csproj"},
     @{Path="$rootPath\src\Services\Ordering\Ordering.API";Prj="Ordering.API.csproj"},
-    @{Path="$rootPath\src\Services\Basket\Basket.API";Prj="Basket.API.csproj"}
+    @{Path="$rootPath\src\Services\Basket\Basket.API";Prj="Basket.API.csproj"},
+    @{Path="$rootPath\src\Services\GracePeriod\GracePeriodManager";Prj="GracePeriodManager.csproj"},
+    @{Path="$rootPath\src\Services\Location\Locations.API";Prj="Locations.API.csproj"},
+    @{Path="$rootPath\src\Services\Marketing\Marketing.API";Prj="Marketing.API.csproj"},
+    @{Path="$rootPath\src\Services\Payment\Payment.API";Prj="Payment.API.csproj"},
     @{Path="$rootPath\src\Web\WebStatus";Prj="WebStatus.csproj"}
 
 $projectPaths | foreach {
diff --git a/k8s/conf_cloud.yml b/k8s/conf_cloud.yml
index a7f855095..ac8fd56fc 100644
--- a/k8s/conf_cloud.yml
+++ b/k8s/conf_cloud.yml
@@ -30,6 +30,7 @@ data:
 # GracePeriodManager entries
   GracePeriodTime: "5"  # Grace period duration (time when you can cancel order) in minutes
   GracePeriodCheckUpdateTime: "60000"   # Interval time to check new Order status (in milliseconds)
+  GracePeriodManagerBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
 # Global entries
   UseAzureServiceBus: "TRUE" IF USE AZURE SB ("FALSE" FOR USING RABBITMQ)
   keystore: REDIS CONNECTION STRING FOR KEYSTORE
\ No newline at end of file
diff --git a/k8s/conf_local.yml b/k8s/conf_local.yml
index 1193fc36d..1ac16bb28 100644
--- a/k8s/conf_local.yml
+++ b/k8s/conf_local.yml
@@ -23,5 +23,6 @@ data:
   PaymentBus: rabbitmq
   GracePeriodTime: "1"
   GracePeriodCheckUpdateTime: "60000"
+  GracePeriodManagerBus: rabbitmq
   UseAzureServiceBus: "False"
   keystore: keystore-data
diff --git a/k8s/deploy.ps1 b/k8s/deploy.ps1
index 0f6701c23..a203b86bb 100644
--- a/k8s/deploy.ps1
+++ b/k8s/deploy.ps1
@@ -63,7 +63,7 @@ if ($buildImages) {
     docker-compose -p .. -f ../docker-compose.yml build    
 
     Write-Host "Pushing images to $registry/$dockerOrg..." -ForegroundColor Yellow
-    $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus")
+    $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "graceperiodmanager")
 
     foreach ($service in $services) {
         $imageFqdn = if ($useDockerHub)  {"$dockerOrg/${service}"} else {"$registry/$dockerOrg/${service}"}
@@ -136,7 +136,7 @@ ExecKube -cmd 'create configmap urls `
     --from-literal=BasketHealthCheckUrl=http://basket/hc `
     --from-literal=CatalogUrl=http://$($externalDns)/catalog-api `
     --from-literal=CatalogHealthCheckUrl=http://catalog/hc `
-	--from-literal=PicBaseUrl=http://$($externalDns)/catalog-api/api/v1/pic/ `
+	--from-literal=PicBaseUrl=http://$($externalDns)/catalog-api/api/v1/catalog/items/[0]/pic/ `
     --from-literal=IdentityUrl=http://$($externalDns)/identity `
     --from-literal=IdentityHealthCheckUrl=http://identity/hc `
     --from-literal=OrderingUrl=http://ordering `
@@ -152,6 +152,7 @@ ExecKube -cmd 'create configmap urls `
     --from-literal=SpaClientCatalogExternalUrl=http://$($externalDns)/catalog-api `
     --from-literal=SpaClientBasketExternalUrl=http://$($externalDns)/basket-api `
     --from-literal=SpaClientIdentityExternalUrl=http://$($externalDns)/identity `
+    --from-literal=LocationsHealthCheckUrl=http://locations/hc `
     --from-literal=SpaClientExternalUrl=http://$($externalDns)'
     
 ExecKube -cmd 'label configmap urls app=eshop'
@@ -181,6 +182,7 @@ ExecKube -cmd 'set image deployments/payment payment=${registryPath}${dockerOrg}
 ExecKube -cmd 'set image deployments/webmvc webmvc=${registryPath}${dockerOrg}/webmvc:$imageTag'
 ExecKube -cmd 'set image deployments/webstatus webstatus=${registryPath}${dockerOrg}/webstatus:$imageTag'
 ExecKube -cmd 'set image deployments/webspa webspa=${registryPath}${dockerOrg}/webspa:$imageTag'
+ExecKube -cmd 'set image deployments/graceperiodmanager graceperiodmanager=${registryPath}${dockerOrg}/graceperiodmanager:$imageTag'
 
 Write-Host "Execute rollout..." -ForegroundColor Yellow
 ExecKube -cmd 'rollout resume deployments/basket'
@@ -193,6 +195,7 @@ ExecKube -cmd 'rollout resume deployments/payment'
 ExecKube -cmd 'rollout resume deployments/webmvc'
 ExecKube -cmd 'rollout resume deployments/webstatus'
 ExecKube -cmd 'rollout resume deployments/webspa'
+ExecKube -cmd 'rollout resume deployments/graceperiodmanager'
 
 Write-Host "WebSPA is exposed at http://$externalDns, WebMVC at http://$externalDns/webmvc, WebStatus at http://$externalDns/webstatus" -ForegroundColor Yellow
 
diff --git a/k8s/deployments.yaml b/k8s/deployments.yaml
index 18006285f..0092a747d 100644
--- a/k8s/deployments.yaml
+++ b/k8s/deployments.yaml
@@ -185,8 +185,8 @@ spec:
   template:
     metadata:
       labels:
-        app: graceperiodmanager
-        component: ordering
+        app: eshop
+        component: graceperiodmanager
     spec:
       containers:
       - name: graceperiodmanager
@@ -455,6 +455,16 @@ spec:
            configMapKeyRef:
              name: urls
              key: OrderingHealthCheckUrl
+        - name: LocationsUrl
+          valueFrom:
+           configMapKeyRef:
+             name: urls
+             key: LocationsHealthCheckUrl
+        - name: MarketingUrl
+          valueFrom:
+           configMapKeyRef:
+             name: urls
+             key: MarketingHealthCheckUrl
         - name: mvc
           valueFrom:
            configMapKeyRef: