diff --git a/.github/workflows/basket-api-deploy.yml b/.github/workflows/basket-api-deploy.yml
index 8a5bf4803..43b9b95c5 100644
--- a/.github/workflows/basket-api-deploy.yml
+++ b/.github/workflows/basket-api-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: basket-api
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
 
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/catalog-api-deploy.yml b/.github/workflows/catalog-api-deploy.yml
index c0538b3a0..ae49c6a85 100644
--- a/.github/workflows/catalog-api-deploy.yml
+++ b/.github/workflows/catalog-api-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: catalog-api
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/identity-api-deploy.yml b/.github/workflows/identity-api-deploy.yml
index 8d5f4a24b..bcdc9df41 100644
--- a/.github/workflows/identity-api-deploy.yml
+++ b/.github/workflows/identity-api-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: identity-api
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/mobileshoppingagg-deploy.yml b/.github/workflows/mobileshoppingagg-deploy.yml
index d283e7c22..cb38de329 100644
--- a/.github/workflows/mobileshoppingagg-deploy.yml
+++ b/.github/workflows/mobileshoppingagg-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: mobileshoppingagg
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/ordering-api-deploy.yml b/.github/workflows/ordering-api-deploy.yml
index b2d933787..0a3ac5bdc 100644
--- a/.github/workflows/ordering-api-deploy.yml
+++ b/.github/workflows/ordering-api-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: ordering-api
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/ordering-backgroundtasks-deploy.yml b/.github/workflows/ordering-backgroundtasks-deploy.yml
index b276f5b6c..9f01f4e25 100644
--- a/.github/workflows/ordering-backgroundtasks-deploy.yml
+++ b/.github/workflows/ordering-backgroundtasks-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: ordering-backgroundtasks
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/ordering-signalrhub-deploy.yml b/.github/workflows/ordering-signalrhub-deploy.yml
index 770ea348f..6f2642f2f 100644
--- a/.github/workflows/ordering-signalrhub-deploy.yml
+++ b/.github/workflows/ordering-signalrhub-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: ordering-signalrhub
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/payment-api-deploy.yml b/.github/workflows/payment-api-deploy.yml
index a57bc7ec1..9f5ad1749 100644
--- a/.github/workflows/payment-api-deploy.yml
+++ b/.github/workflows/payment-api-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: payment-api
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/webhooks-api-deploy.yml b/.github/workflows/webhooks-api-deploy.yml
index 7b5cea483..adb3ee122 100644
--- a/.github/workflows/webhooks-api-deploy.yml
+++ b/.github/workflows/webhooks-api-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: webhooks-api
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/webmvc-deploy.yml b/.github/workflows/webmvc-deploy.yml
index e61c8dc7a..97b5fdf53 100644
--- a/.github/workflows/webmvc-deploy.yml
+++ b/.github/workflows/webmvc-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: webmvc
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/webshoppingagg-deploy.yml b/.github/workflows/webshoppingagg-deploy.yml
index 60df219a3..bc946aa7b 100644
--- a/.github/workflows/webshoppingagg-deploy.yml
+++ b/.github/workflows/webshoppingagg-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: webshoppingagg
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/webspa-deploy.yml b/.github/workflows/webspa-deploy.yml
index 3679e8f32..598f55b63 100644
--- a/.github/workflows/webspa-deploy.yml
+++ b/.github/workflows/webspa-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: webspa
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file
diff --git a/.github/workflows/webstatus-deploy.yml b/.github/workflows/webstatus-deploy.yml
index fc05b7797..51d93c492 100644
--- a/.github/workflows/webstatus-deploy.yml
+++ b/.github/workflows/webstatus-deploy.yml
@@ -12,7 +12,7 @@ on:
 
 env:
   CHART: webstatus
-  namespace: eshop
+  NAMESPACE: eshop
   app-name: eshop
   CHART_ROOT: deploy/k8s/helm
 
@@ -44,7 +44,7 @@ jobs:
       
       - name: Deploy CHART
         run: |
-          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --namespace ${{ env.namespace }} --acr-connected
+          ./deploy-CHART.sh -c ${{ env.CHART }} --dns aks --aks-name ${{ secrets.CLUSTER_NAME }} --aks-rg ${{ secrets.RESOURCE_GROUP }} -r ${{ secrets.REGISTRY_HOST }} -t $TAG --NAMESPACE ${{ env.NAMESPACE }} --acr-connected
         env:
           TAG: ${{ env.BRANCH }}
         working-directory: ${{ env.CHART_ROOT }}
\ No newline at end of file