diff --git a/.github/workflows/gcp-waf-ce-apply.yaml b/.github/workflows/gcp-waf-ce-apply.yaml
index a66c3803c..22316712a 100644
--- a/.github/workflows/gcp-waf-ce-apply.yaml
+++ b/.github/workflows/gcp-waf-ce-apply.yaml
@@ -15,10 +15,10 @@ jobs:
         working-directory: ./gcp/infra
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -30,7 +30,7 @@ jobs:
             cloud {
               organization = "${{ secrets.TF_CLOUD_ORGANIZATION }}"
               workspaces {
-                name = "${{ secrets.TF_CLOUD_WORKSPACE_INFRA }}"
+                name = "${{ secrets.TF_CLOUD_WORKSPACE_GCP_INFRA }}"
               }
             }
           }
@@ -90,10 +90,10 @@ jobs:
         working-directory: ./gcp/vm
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -165,10 +165,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
diff --git a/.github/workflows/gcp-waf-ce-destroy.yaml b/.github/workflows/gcp-waf-ce-destroy.yaml
index aaa8435fe..c8145f6ff 100644
--- a/.github/workflows/gcp-waf-ce-destroy.yaml
+++ b/.github/workflows/gcp-waf-ce-destroy.yaml
@@ -15,10 +15,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -93,10 +93,10 @@ jobs:
         working-directory: ./gcp/vm
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -167,10 +167,10 @@ jobs:
         working-directory: ./gcp/infra
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -182,7 +182,7 @@ jobs:
             cloud {
               organization = "${{ secrets.TF_CLOUD_ORGANIZATION }}"
               workspaces {
-                name = "${{ secrets.TF_CLOUD_WORKSPACE_INFRA }}"
+                name = "${{ secrets.TF_CLOUD_WORKSPACE_GCP_INFRA }}"
               }
             }
           }
diff --git a/.github/workflows/waf-k8s-apply.yml b/.github/workflows/waf-k8s-apply.yml
index 594b6ce76..66954738c 100644
--- a/.github/workflows/waf-k8s-apply.yml
+++ b/.github/workflows/waf-k8s-apply.yml
@@ -15,10 +15,10 @@ jobs:
         working-directory: ./aws/infra
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -89,10 +89,10 @@ jobs:
         working-directory: ./aws/eks-cluster
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -165,10 +165,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -239,10 +239,10 @@ jobs:
         working-directory: ./aws/eks-cluster/ce-deployment
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -354,10 +354,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
diff --git a/.github/workflows/waf-k8s-destroy.yml b/.github/workflows/waf-k8s-destroy.yml
index d93f64e63..797bd20b0 100644
--- a/.github/workflows/waf-k8s-destroy.yml
+++ b/.github/workflows/waf-k8s-destroy.yml
@@ -15,10 +15,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
       - name: Setup Terraform Backend
@@ -92,10 +92,10 @@ jobs:
         working-directory: ./aws/eks-cluster/ce-deployment
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -205,10 +205,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -279,10 +279,10 @@ jobs:
         working-directory: ./aws/eks-cluster
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -353,10 +353,10 @@ jobs:
         working-directory: ./aws/infra
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
diff --git a/.github/workflows/waf-on-ce-aws-apply.yml b/.github/workflows/waf-on-ce-aws-apply.yml
index 1fb76ce16..5d6a52bf3 100644
--- a/.github/workflows/waf-on-ce-aws-apply.yml
+++ b/.github/workflows/waf-on-ce-aws-apply.yml
@@ -16,10 +16,10 @@ jobs:
         working-directory: ./aws/infra
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -90,10 +90,10 @@ jobs:
         working-directory: ./aws/eks-cluster
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -164,10 +164,10 @@ jobs:
         working-directory: ./shared/boutique
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -237,10 +237,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
diff --git a/.github/workflows/waf-on-ce-aws-destroy.yml b/.github/workflows/waf-on-ce-aws-destroy.yml
index 476c445d9..6a8a1fcd0 100644
--- a/.github/workflows/waf-on-ce-aws-destroy.yml
+++ b/.github/workflows/waf-on-ce-aws-destroy.yml
@@ -16,10 +16,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -91,10 +91,10 @@ jobs:
         working-directory: ./shared/boutique
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -164,10 +164,10 @@ jobs:
         working-directory: ./aws/eks-cluster
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -239,10 +239,10 @@ jobs:
         working-directory: ./aws/infra
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
diff --git a/.github/workflows/waf-on-ce-az-apply.yml b/.github/workflows/waf-on-ce-az-apply.yml
index 7c91642cc..d6540aba1 100644
--- a/.github/workflows/waf-on-ce-az-apply.yml
+++ b/.github/workflows/waf-on-ce-az-apply.yml
@@ -16,10 +16,10 @@ jobs:
         working-directory: ./azure/azure-infra
     steps:
       - name: Checkout    
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -31,7 +31,7 @@ jobs:
             cloud {
               organization = "${{ secrets.TF_CLOUD_ORGANIZATION }}"
               workspaces {
-                name = "${{ secrets.TF_CLOUD_WORKSPACE_INFRA }}"
+                name = "${{ secrets.TF_CLOUD_WORKSPACE_AZURE_INFRA }}"
               }
             }
           }
@@ -90,10 +90,10 @@ jobs:
         working-directory: ./azure/aks-cluster
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -164,10 +164,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
diff --git a/.github/workflows/waf-on-ce-az-destroy.yml b/.github/workflows/waf-on-ce-az-destroy.yml
index 3491c3219..5c876a823 100644
--- a/.github/workflows/waf-on-ce-az-destroy.yml
+++ b/.github/workflows/waf-on-ce-az-destroy.yml
@@ -16,10 +16,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -92,10 +92,10 @@ jobs:
         working-directory: ./azure/aks-cluster
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -168,10 +168,10 @@ jobs:
     
     steps:
       - name: Checkout
-        uses: actions/checkout@v3   
+        uses: actions/checkout@v4 
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -183,7 +183,7 @@ jobs:
             cloud {
               organization = "${{ secrets.TF_CLOUD_ORGANIZATION }}"
               workspaces {
-                name = "${{ secrets.TF_CLOUD_WORKSPACE_INFRA }}"
+                name = "${{ secrets.TF_CLOUD_WORKSPACE_AZURE_INFRA }}"
               }
             }
           }
diff --git a/.github/workflows/waf-re-ac-k8s-apply.yml b/.github/workflows/waf-re-ac-k8s-apply.yml
index aad921e8c..b5697bcfb 100644
--- a/.github/workflows/waf-re-ac-k8s-apply.yml
+++ b/.github/workflows/waf-re-ac-k8s-apply.yml
@@ -16,10 +16,10 @@ jobs:
         working-directory: ./azure/azure-infra
     steps:
       - name: Checkout    
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -31,7 +31,7 @@ jobs:
             cloud {
               organization = "${{ secrets.TF_CLOUD_ORGANIZATION }}"
               workspaces {
-                name = "${{ secrets.TF_CLOUD_WORKSPACE_INFRA }}"
+                name = "${{ secrets.TF_CLOUD_WORKSPACE_AZURE_INFRA }}"
               }
             }
           }
@@ -90,10 +90,10 @@ jobs:
         working-directory: ./azure/aks-cluster
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -164,10 +164,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
diff --git a/.github/workflows/waf-re-ac-k8s-destroy.yml b/.github/workflows/waf-re-ac-k8s-destroy.yml
index 29b4652cd..2edae59f7 100644
--- a/.github/workflows/waf-re-ac-k8s-destroy.yml
+++ b/.github/workflows/waf-re-ac-k8s-destroy.yml
@@ -15,10 +15,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -91,10 +91,10 @@ jobs:
         working-directory: ./azure/aks-cluster
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -167,10 +167,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -182,7 +182,7 @@ jobs:
             cloud {
               organization = "${{ secrets.TF_CLOUD_ORGANIZATION }}"
               workspaces {
-                name = "${{ secrets.TF_CLOUD_WORKSPACE_INFRA }}"
+                name = "${{ secrets.TF_CLOUD_WORKSPACE_AZURE_INFRA }}"
               }
             }
           }
diff --git a/.github/workflows/waf-re-ac-vm-apply.yml b/.github/workflows/waf-re-ac-vm-apply.yml
index 882f056a1..5fbc9ba38 100644
--- a/.github/workflows/waf-re-ac-vm-apply.yml
+++ b/.github/workflows/waf-re-ac-vm-apply.yml
@@ -16,10 +16,10 @@ jobs:
         working-directory: ./azure/azure-infra
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -90,10 +90,10 @@ jobs:
         working-directory: ./azure/azure-vm
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -165,10 +165,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
diff --git a/.github/workflows/waf-re-ac-vm-destroy.yml b/.github/workflows/waf-re-ac-vm-destroy.yml
index 129dd89a9..3c273e35c 100644
--- a/.github/workflows/waf-re-ac-vm-destroy.yml
+++ b/.github/workflows/waf-re-ac-vm-destroy.yml
@@ -16,10 +16,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -92,10 +92,10 @@ jobs:
         working-directory: ./azure/azure-vm
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -168,10 +168,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
diff --git a/.github/workflows/waf-re-apply.yml b/.github/workflows/waf-re-apply.yml
index 001b4548c..941982cb2 100644
--- a/.github/workflows/waf-re-apply.yml
+++ b/.github/workflows/waf-re-apply.yml
@@ -16,10 +16,10 @@ jobs:
         working-directory: ./azure/azure-infra
     steps:
       - name: Checkout    
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -90,10 +90,10 @@ jobs:
         working-directory: ./azure/azure-vm
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -165,10 +165,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
diff --git a/.github/workflows/waf-re-destroy.yml b/.github/workflows/waf-re-destroy.yml
index bf46225ed..7f0857e16 100644
--- a/.github/workflows/waf-re-destroy.yml
+++ b/.github/workflows/waf-re-destroy.yml
@@ -16,10 +16,10 @@ jobs:
         working-directory: ./xc
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -92,10 +92,10 @@ jobs:
         working-directory: ./azure/azure-vm
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
@@ -168,10 +168,10 @@ jobs:
     
     steps:
       - name: Checkout
-        uses: actions/checkout@v3   
+        uses: actions/checkout@v4  
       
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v2
+        uses: hashicorp/setup-terraform@v3
         with:
           cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }}
 
diff --git a/aws/eks-cluster/data.tf b/aws/eks-cluster/data.tf
index ddc399957..31bda7d38 100644
--- a/aws/eks-cluster/data.tf
+++ b/aws/eks-cluster/data.tf
@@ -1,6 +1,6 @@
 data "tfe_outputs" "infra" {
   organization = var.tf_cloud_organization
-  workspace = "infra"
+  workspace = "${coalesce(var.aws_waf_ce, "infra")}"
 }
 
 data "aws_instances" "my_worker_nodes" {
@@ -15,4 +15,4 @@ data "aws_instance" "ec2_subnets" {
   depends_on = [aws_eks_addon.cluster-addons]
   count    = var.skip_ha_az_node_group ? var.desired_size : var.desired_size + var.desired_size
   instance_id = data.aws_instances.my_worker_nodes.ids[count.index]
-}
\ No newline at end of file
+}
diff --git a/aws/eks-cluster/terraform.tfvars.examples b/aws/eks-cluster/terraform.tfvars.examples
index e372b977b..796a940b0 100644
--- a/aws/eks-cluster/terraform.tfvars.examples
+++ b/aws/eks-cluster/terraform.tfvars.examples
@@ -4,4 +4,8 @@ desired_size = 1
 max_size = 1
 min_size= 1
 skip_private_subnet_creation = true
-allow_all_ingress_traffic_to_cluster = true
\ No newline at end of file
+allow_all_ingress_traffic_to_cluster = true
+
+# needed value: aws-infra
+aws_waf_ce = "" 
+
diff --git a/aws/eks-cluster/variables.tf b/aws/eks-cluster/variables.tf
index 258253b3a..05dd7a50d 100644
--- a/aws/eks-cluster/variables.tf
+++ b/aws/eks-cluster/variables.tf
@@ -74,6 +74,7 @@ variable "allow_all_ingress_traffic_to_cluster" {
  description  = "Acception all Traffic to the instance created by EKS Cluster Nodes"
  default      = false
 }
+
 variable "aws_access_key" {
   description = "AWS Access Key ID"
   type        = string
@@ -88,7 +89,11 @@ variable "aws_secret_key" {
   default     = null
 }
 
-
+variable "aws_waf_ce" {
+  description = "Infra"
+  type        = string
+  default     = ""
+}
 
 
 
diff --git a/azure/aks-cluster/data.tf b/azure/aks-cluster/data.tf
index 74e1eb041..ef016ff16 100644
--- a/azure/aks-cluster/data.tf
+++ b/azure/aks-cluster/data.tf
@@ -1,4 +1,4 @@
-data "tfe_outputs" "infra" {
+data "tfe_outputs" "azure-infra" {
   organization = var.tf_cloud_organization
-  workspace = "infra"
+  workspace = "azure-infra"
 }
diff --git a/azure/aks-cluster/locals.tf b/azure/aks-cluster/locals.tf
index a838a7a63..5d63a0e55 100644
--- a/azure/aks-cluster/locals.tf
+++ b/azure/aks-cluster/locals.tf
@@ -1,11 +1,11 @@
 locals {
-  azure_region        = data.tfe_outputs.infra.values.azure_region
-  resource_group_name = data.tfe_outputs.infra.values.resource_group_name
-  vnet_name           = data.tfe_outputs.infra.values.vnet_name
-  subnet_name         = data.tfe_outputs.infra.values.subnet_name
-  subnet_id           = data.tfe_outputs.infra.values.subnet_id
-  project_prefix      = data.tfe_outputs.infra.values.project_prefix
-  build_suffix        = data.tfe_outputs.infra.values.build_suffix
+  azure_region        = data.tfe_outputs.azure-infra.values.azure_region
+  resource_group_name = data.tfe_outputs.azure-infra.values.resource_group_name
+  vnet_name           = data.tfe_outputs.azure-infra.values.vnet_name
+  subnet_name         = data.tfe_outputs.azure-infra.values.subnet_name
+  subnet_id           = data.tfe_outputs.azure-infra.values.subnet_id
+  project_prefix      = data.tfe_outputs.azure-infra.values.project_prefix
+  build_suffix        = data.tfe_outputs.azure-infra.values.build_suffix
 }
 
 
diff --git a/azure/aks-cluster/versions.tf b/azure/aks-cluster/versions.tf
index 5386fa440..6f253d11b 100644
--- a/azure/aks-cluster/versions.tf
+++ b/azure/aks-cluster/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.18.0"
+      version = ">=3.18.0"
     }
   }
 }
diff --git a/azure/azure-infra/versions.tf b/azure/azure-infra/versions.tf
index 5386fa440..6f253d11b 100644
--- a/azure/azure-infra/versions.tf
+++ b/azure/azure-infra/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.18.0"
+      version = ">=3.18.0"
     }
   }
 }
diff --git a/azure/azure-vm/main.tf b/azure/azure-vm/main.tf
index f3e4886da..1324b6998 100644
--- a/azure/azure-vm/main.tf
+++ b/azure/azure-vm/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.0.0"
+      version = ">=3.0.0"
     }
   }
 }
diff --git a/gcp/vm/data.tf b/gcp/vm/data.tf
index 6f0d5a3a9..a0dbb0c42 100644
--- a/gcp/vm/data.tf
+++ b/gcp/vm/data.tf
@@ -5,5 +5,5 @@ variable "tf_cloud_organization" {
 
 data "tfe_outputs" "infra" {
   organization = var.tf_cloud_organization
-  workspace = "infra"
+  workspace = "gcp-infra"
 }
diff --git a/shared/boutique/data.tf b/shared/boutique/data.tf
index d957516eb..63f49d4da 100644
--- a/shared/boutique/data.tf
+++ b/shared/boutique/data.tf
@@ -1,6 +1,6 @@
 data "tfe_outputs" "infra" {
   organization = var.tf_cloud_organization
-  workspace = "infra"
+  workspace = "aws-infra"
 }
 data "tfe_outputs" "eks" {
   organization = var.tf_cloud_organization
diff --git a/workflow-guides/waf/f5-xc-waf-on-ce/aws/automation-demo-guide.rst b/workflow-guides/waf/f5-xc-waf-on-ce/aws/automation-demo-guide.rst
index 954e7e97a..3ca62b20a 100644
--- a/workflow-guides/waf/f5-xc-waf-on-ce/aws/automation-demo-guide.rst
+++ b/workflow-guides/waf/f5-xc-waf-on-ce/aws/automation-demo-guide.rst
@@ -35,7 +35,7 @@ Terraform Cloud
    +---------------------------+-----------------------------------------------------+
    |         **Workflow**      |  **Assets/Workspaces**                              |
    +===========================+=====================================================+
-   | F5 XC WAF on CE Deploy    | infra, aws_eks_cluster, boutique_app, xc-ce-site    |
+   | F5 XC WAF on CE Deploy    | aws-infra, aws_eks_cluster, boutique_app, xc-ce-site|
    +---------------------------+-----------------------------------------------------+
 
 .. image:: Assets/workspace.jpg
@@ -86,10 +86,10 @@ GitHub
    -  SSH_KEY: ssh key for accessing the created resources
    -  TF_API_TOKEN: Your Terraform Cloud API token
    -  TF_CLOUD_ORGANIZATION: Your Terraform Cloud Organization name
-   -  TF_CLOUD_WORKSPACE_BOUTIQUE: Your Terraform Cloud workspace for Boutique app
-   -  TF_CLOUD_WORKSPACE_EKS: Your Terraform Cloud workspace for AWS EKS Cluster
-   -  TF_CLOUD_WORKSPACE_INFRA: Your Terraform Cloud workspace for AWS Infrastructure
-   -  TF_CLOUD_WORKSPACE_XC: Your Terraform Cloud workspace for F5 XC
+   -  TF_CLOUD_WORKSPACE_BOUTIQUE: boutique_app
+   -  TF_CLOUD_WORKSPACE_EKS: aws_eks_cluster
+   -  TF_CLOUD_WORKSPACE_INFRA: aws-infra
+   -  TF_CLOUD_WORKSPACE_XC: xc-ce-site
    
 
 -  Created GitHub Action Secrets: 
@@ -140,6 +140,7 @@ Workflow File: `waf-on-ce-aws-destroy.yml </.github/workflows/waf-on-ce-aws-dest
 -  min_size = "set to number 1"
 -  skip_private_subnet_creation = "set the boolean to true to deploy EKS Cluster Nodes in Public Subnets"
 -  allow_all_ingress_traffic_to_cluster = "Set the boolean to true to accept the traffic from F5 XC VPC Site(master)"
+-  aws_waf_ce = "aws-infra"
 
 **Step 4:** Rename ``xc/terraform.tfvars.examples`` to ``xc/terraform.tfvars`` and add the following data: 
 
@@ -163,6 +164,8 @@ Workflow File: `waf-on-ce-aws-destroy.yml </.github/workflows/waf-on-ce-aws-dest
 
 -  http_only = "set to true to deploy a http loadbalancer."
 
+-  aws = "aws-infra"
+
 
 Keep the rest of the values as they are.
 
diff --git a/workflow-guides/waf/f5-xc-waf-on-ce/azure/assets/workspaces.JPG b/workflow-guides/waf/f5-xc-waf-on-ce/azure/assets/workspaces.JPG
index 4645d7692..7175369d7 100644
Binary files a/workflow-guides/waf/f5-xc-waf-on-ce/azure/assets/workspaces.JPG and b/workflow-guides/waf/f5-xc-waf-on-ce/azure/assets/workspaces.JPG differ
diff --git a/workflow-guides/waf/f5-xc-waf-on-ce/azure/automation-demo-guide.rst b/workflow-guides/waf/f5-xc-waf-on-ce/azure/automation-demo-guide.rst
index f643ab3b3..f8bece9d8 100644
--- a/workflow-guides/waf/f5-xc-waf-on-ce/azure/automation-demo-guide.rst
+++ b/workflow-guides/waf/f5-xc-waf-on-ce/azure/automation-demo-guide.rst
@@ -36,7 +36,7 @@ Terraform Cloud
    +---------------------------+-------------------------------------------+
    |         **Workflow**      |  **Assets/Workspaces**                    |
    +===========================+===========================================+
-   | f5-xc-waf-on-ce           | infra, aks-cluster, xc-deploy             |
+   | f5-xc-waf-on-ce           | azure-infra, aks-cluster, xc-deploy       |
    +---------------------------+-------------------------------------------+
 
 .. image:: assets/workspaces.JPG
@@ -87,9 +87,15 @@ GitHub
    -  TF_CLOUD_WORKSPACE\_\ *<Workspace Name>*: Create for each
       workspace in your workflow per each job
 
+      -  EX: TF_CLOUD_WORKSPACE_AZURE_INFRA would be created with the
+         value ``azure-infra``
+
       -  EX: TF_CLOUD_WORKSPACE_AKS_CLUSTER would be created with the
          value ``aks-cluster``
 
+      -  EX: TF_CLOUD_WORKSPACE_XC_DEPLOY would be created with the
+         value ``xc-deploy``
+
 -  Created GitHub Action Secrets:
 
 .. image:: assets/action-secret.JPG
@@ -122,11 +128,13 @@ Workflow File: `waf-on-ce-az-destroy.yml </.github/workflows/waf-on-ce-az-destro
 
 **STEP 2:** Rename ``azure/azure-infra/terraform.tfvars.examples`` to ``azure/azure-infra/terraform.tfvars`` and add the following data: 
 
--  project_prefix = “Your project identifier name in **lower case** letters only - this will be applied as a prefix to all assets”
+-  Set project_prefix = “Your project identifier name in **lower case** letters only - this will be applied as a prefix to all assets”
 
--  azure_region = “Azure Region/Location” ex. "southeastasia"
+-  Set azure_region = “Azure Region/Location” ex. "southeastasia"
 
--  Also update assets boolean value as per your workflow, here set aks-cluster to true
+-  Set aks-cluster to true
+
+-  Also update assets boolean value as per your workflow (for this use-case set all remaining values as false)
 
 **Step 3:** Rename ``xc/terraform.tfvars.examples`` to ``xc/terraform.tfvars`` and add the following data: 
 
@@ -142,9 +150,9 @@ Workflow File: `waf-on-ce-az-destroy.yml </.github/workflows/waf-on-ce-az-destro
 
 -  k8s_pool = "set to true if application is residing in k8s environment"
 
--  serviceName = "k8s service name of frontend microservice"
+-  serviceName = "k8s service name of frontend microservice" (for this use case set it to "frontend.default")
 
--  serviceport = "k8s service port of frontend microservice"
+-  serviceport = "k8s service port of frontend microservice" (for this use case set it to "80")
 
 -  advertise_sites = "set to false if want to advertise on public"
 
@@ -154,7 +162,9 @@ Workflow File: `waf-on-ce-az-destroy.yml </.github/workflows/waf-on-ce-az-destro
 
 -  xc_service_discovery = "set to true if want to create service discovery object in XC console"
 
-Keep the rest of the values as they are.
+-  Set azure = "azure-infra"
+
+Keep rest of the values as they are set by default in terraform.tfvars.examples file.
 
 **STEP 4:** Commit and push your build branch to your forked repo 
 
diff --git a/workflow-guides/waf/f5-xc-waf-on-ce/gcp/automation-demo-guide.rst b/workflow-guides/waf/f5-xc-waf-on-ce/gcp/automation-demo-guide.rst
index 0a5859e49..7c2f7b966 100644
--- a/workflow-guides/waf/f5-xc-waf-on-ce/gcp/automation-demo-guide.rst
+++ b/workflow-guides/waf/f5-xc-waf-on-ce/gcp/automation-demo-guide.rst
@@ -36,7 +36,7 @@ Terraform Cloud
    +---------------------------+-------------------------------------------+
    |         **Workflow**      |  **Assets/Workspaces**                    |
    +===========================+===========================================+
-   | deploy-waf-gcp            | infra, juiceshop, xc                      |
+   | deploy-waf-gcp            | gcp-infra, juiceshop, xc                  |
    +---------------------------+-------------------------------------------+
 
 
@@ -78,7 +78,7 @@ GitHub
       workspace in your workflow per each job
 
       -  TF_CLOUD_WORKSPACE_INFRA would be created with the
-         value ``infra``
+         value ``gcp-infra``
 
       -  TF_CLOUD_WORKSPACE_APP would be created with the
          value ``juiceshop``
@@ -145,6 +145,8 @@ Workflow File: `gcp-waf-ce-destroy.yml </.github/workflows/gcp-waf-ce-destroy.ya
 
 -  gcp_ce_site = "set to true since we want to deploy GCP CE site"
 
+-  gcp = "gcp-infra"
+
 .. image:: assets/xc-tfvars.JPG
 
 
@@ -162,6 +164,7 @@ Workflow File: `gcp-waf-ce-destroy.yml </.github/workflows/gcp-waf-ce-destroy.ya
 **STEP 6:** Once CE site is online and to validate the test infra & demo app accessibility, copy the public IP of CE site in `GCP CE Site View mode` and send a request with XC LB domain as a `Host` header, You should be able to access the demo application as shown in the image below:
 
 .. image:: assets/gcp-ce-ip.jpg
+   
 .. image:: assets/postman.jpg
 
 
diff --git a/workflow-guides/waf/f5-xc-waf-on-re-appconnect/k8s/assets/workspaces.JPG b/workflow-guides/waf/f5-xc-waf-on-re-appconnect/k8s/assets/workspaces.JPG
index b9dec84b7..95d1f0575 100644
Binary files a/workflow-guides/waf/f5-xc-waf-on-re-appconnect/k8s/assets/workspaces.JPG and b/workflow-guides/waf/f5-xc-waf-on-re-appconnect/k8s/assets/workspaces.JPG differ
diff --git a/workflow-guides/waf/f5-xc-waf-on-re-appconnect/k8s/k8s-automation-demo-guide.rst b/workflow-guides/waf/f5-xc-waf-on-re-appconnect/k8s/k8s-automation-demo-guide.rst
index 342ff6e63..e01750a3d 100644
--- a/workflow-guides/waf/f5-xc-waf-on-re-appconnect/k8s/k8s-automation-demo-guide.rst
+++ b/workflow-guides/waf/f5-xc-waf-on-re-appconnect/k8s/k8s-automation-demo-guide.rst
@@ -33,7 +33,7 @@ Terraform Cloud
    +---------------------------+-------------------------------------------+
    |         **Workflow**      |  **Assets/Workspaces**                    |
    +===========================+===========================================+
-   | f5-xc-waf-on-re-appconnect| infra, aks-cluster, xc                    |
+   | f5-xc-waf-on-re-appconnect| azure-infra, aks-cluster, xc              |
    +---------------------------+-------------------------------------------+
 
 .. image:: assets/workspaces.JPG
@@ -121,9 +121,9 @@ Workflow File: `waf-re-ac-k8s-destroy.yml </.github/workflows/waf-re-ac-k8s-dest
 
 -  azure_region = “Azure Region/Location” ex. "southeastasia".
 
--  aks-cluster = Set this value to true as we need AKS cluster in our usecase.
+-  aks-cluster = Set this value to true as we need AKS cluster in our use-case.
 
--  Also update assets boolean value as per your workflow.
+-  Also update assets boolean value as per your workflow. (for this use-case set all remaining values as false)
 
 **Step 3:** Rename ``xc/terraform.tfvars.examples`` to ``xc/terraform.tfvars`` and add the following data: 
 
@@ -139,9 +139,9 @@ Workflow File: `waf-re-ac-k8s-destroy.yml </.github/workflows/waf-re-ac-k8s-dest
 
 -  k8s_pool = "Set to true as backend is residing in k8s"
 
--  serviceName = "k8s service name of backend"
+-  serviceName = "k8s service name of backend" (for this use case set it to "frontend.default")
 
--  serviceport = "k8s service port of backend"
+-  serviceport = "k8s service port of backend" (for this use case set it to "80")
 
 -  advertise_sites = "set to false as we want to advertise on public"
 
@@ -153,6 +153,8 @@ Workflow File: `waf-re-ac-k8s-destroy.yml </.github/workflows/waf-re-ac-k8s-dest
 
 -  xc_service_discovery = "set to true as want to create service discovery object in XC console"
 
+-  Set azure = "azure-infra"
+
 **STEP 4:** Commit and push your build branch to your forked repo 
 
 - Build will run and can be monitored in the GitHub Actions tab and TF Cloud console
diff --git a/workflow-guides/waf/f5-xc-waf-on-re-appconnect/vm/vm-automation-demo-guide.rst b/workflow-guides/waf/f5-xc-waf-on-re-appconnect/vm/vm-automation-demo-guide.rst
index 5eb58f519..ec4756997 100644
--- a/workflow-guides/waf/f5-xc-waf-on-re-appconnect/vm/vm-automation-demo-guide.rst
+++ b/workflow-guides/waf/f5-xc-waf-on-re-appconnect/vm/vm-automation-demo-guide.rst
@@ -122,9 +122,9 @@ Workflow File: `waf-re-ac-vm-destroy.yml </.github/workflows/waf-re-ac-vm-destro
 
 -  azure-vm = Set this value to true as we need Azure in our usecase.
 
--   vm_public_ip = Set this value to false as we dont need public IP to be created for VM
+-  vm_public_ip = Set this value to false as we dont need public IP to be created for VM
 
--  Also update assets boolean value as per your workflow.
+-  Also update assets boolean value as per your workflow. (for this use-case set all remaining values as false)
 
 **Step 3:** Rename ``xc/terraform.tfvars.examples`` to ``xc/terraform.tfvars`` and add the following data: 
 
diff --git a/workflow-guides/waf/f5-xc-waf-on-re/automation-demo-guide.rst b/workflow-guides/waf/f5-xc-waf-on-re/automation-demo-guide.rst
index 99d5bc81c..b8afac5ad 100644
--- a/workflow-guides/waf/f5-xc-waf-on-re/automation-demo-guide.rst
+++ b/workflow-guides/waf/f5-xc-waf-on-re/automation-demo-guide.rst
@@ -90,7 +90,7 @@ GitHub
    -  TF_API_TOKEN: Your Terraform Cloud API token
    -  TF_CLOUD_ORGANIZATION: Your Terraform Cloud Organization name
    -  TF_CLOUD_WORKSPACE\_\ *<Workspace Name>*: Create for each
-      workspace in your workflow per each job
+      workspace used in your workflow
 
       -  EX: TF_CLOUD_WORKSPACE_AZURE_VM would be created with the
          value ``azure-vm``
@@ -131,7 +131,9 @@ Workflow File: `waf-re-destroy.yml </.github/workflows/waf-re-destroy.yml>`__
 
 -  azure_region = “Azure Region/Location” ex. "southeastasia"
 
--  Also update assets boolean value as per your workflow, here set azure-vm and vm_public_ip to true
+-  Set azure-vm and vm_public_ip to true 
+
+-  Also update remaining assets boolean value as per your workflow. (for this use case remaining all values are false)
 
 **Step 3:** Rename ``xc/terraform.tfvars.examples`` to ``xc/terraform.tfvars`` and add the following data: 
 
diff --git a/xc/aws_ce_site.tf b/xc/aws_ce_site.tf
index d034c1851..d22b60c83 100644
--- a/xc/aws_ce_site.tf
+++ b/xc/aws_ce_site.tf
@@ -39,26 +39,30 @@ resource "volterra_aws_vpc_site" "aws_site" {
   ssh_key = var.ssh_key
 }
 
+/*
 resource "null_resource" "before" {
   depends_on       = [volterra_aws_vpc_site.aws_site]
 }
+*/
 
 resource "null_resource" "delay" {
   provisioner "local-exec" {
-    command = "sleep 20"
+    command = "sleep 70"
   }
-  triggers = {
+  /*triggers = {
     "before" = "${null_resource.before.id}"
-  }
+  }*/
 }
 
+/*
 resource "null_resource" "after" {
   depends_on = ["null_resource.delay"]
 }
+*/
 
 resource "volterra_tf_params_action" "example" {
   count = var.aws_ce_site ? 1 : 0
-  depends_on       = [null_resource.after]
+  depends_on       = [null_resource.delay]
   site_name        = "${coalesce(var.site_name, local.project_prefix)}"
   site_kind        = "aws_vpc_site"
   action           = "apply"
@@ -72,4 +76,4 @@ resource "null_resource" "check_site_status_cert2" {
   provisioner "local-exec" {
     command     = format("bash ${path.module}/check_ce_status.sh config/namespaces/system/sites/%s api.p12 %s 3600 cert $VES_P12_PASSWORD", var.site_name, var.xc_tenant)
   }
-}
\ No newline at end of file
+}
diff --git a/xc/azure_ce_site.tf b/xc/azure_ce_site.tf
index 7cc24db00..e3f1a642c 100644
--- a/xc/azure_ce_site.tf
+++ b/xc/azure_ce_site.tf
@@ -59,8 +59,16 @@ resource "volterra_azure_vnet_site" "azure_vnet_site" {
   ssh_key = var.ssh_key
 }
 
+resource "null_resource" "validation-wait" {
+  count = var.az_ce_site ? 1 : 0
+  provisioner "local-exec" {
+    command = "sleep 70"
+  }
+}
+
 resource "volterra_tf_params_action" "action_apply" {
   count = var.az_ce_site ? 1 : 0
+  depends_on      = [null_resource.validation-wait]
   site_name       = volterra_azure_vnet_site.azure_vnet_site[0].name
   site_kind       = "azure_vnet_site"
   action          = "apply"
diff --git a/xc/data.tf b/xc/data.tf
index 2e1949362..c0a2728ba 100644
--- a/xc/data.tf
+++ b/xc/data.tf
@@ -1,7 +1,8 @@
 data "tfe_outputs" "infra" {
   organization = var.tf_cloud_organization
-  workspace = "infra"
+  workspace = "${coalesce(var.aws, var.azure, var.gcp, "infra")}"
 }
+
 data "tfe_outputs" "bigip" {
   count = data.tfe_outputs.infra.values.bigip ? 1 : 0
   organization = var.tf_cloud_organization
diff --git a/xc/gcp_ce_site.tf b/xc/gcp_ce_site.tf
index 9ed93246a..e7e6aa7ce 100644
--- a/xc/gcp_ce_site.tf
+++ b/xc/gcp_ce_site.tf
@@ -46,8 +46,16 @@ resource "volterra_gcp_vpc_site" "site" {
   }
 }
 
+resource "null_resource" "validation-wait-gcp" {
+  count = var.gcp_ce_site ? 1 : 0
+  provisioner "local-exec" {
+    command = "sleep 70"
+  }
+}
+
 resource "volterra_tf_params_action" "apply_gcp_vpc" {
-  count     = var.gcp_ce_site ? 1 : 0
+  count            = var.gcp_ce_site ? 1 : 0
+  depends_on       = [null_resource.validation-wait-gcp]
   site_name        = volterra_gcp_vpc_site.site[0].name
   site_kind        = "gcp_vpc_site"
   action           = "apply"
diff --git a/xc/terraform.tfvars.example b/xc/terraform.tfvars.example
index 2bf06faac..14f0ea84e 100644
--- a/xc/terraform.tfvars.example
+++ b/xc/terraform.tfvars.example
@@ -62,4 +62,9 @@ xc_mud = false
 # CE configs
 gcp_ce_site = "false"
 aws_ce_site = "false"
-site_name = "waf-on-ce"
+site_name = ""
+
+# infra (Needed values: aws-infra, azure-infra, gcp-infra)
+aws   = ""
+azure = ""
+gcp   = ""
diff --git a/xc/variables.tf b/xc/variables.tf
index 67e33157c..955c71796 100644
--- a/xc/variables.tf
+++ b/xc/variables.tf
@@ -136,7 +136,7 @@ variable "iss_claim" {
 variable "aud_claim" {
   type        = list(string)
   description = "JWT Validation audience claim"
-  default     = "[]"
+  default     = [""]
 }
 variable "val_period_enable" {
   type        = string
@@ -301,4 +301,22 @@ variable "aws_secret_key" {
   type        = string
   sensitive   = true
   default     = null
-}
\ No newline at end of file
+}
+
+variable "azure" {
+  description = "Workspace name of Azure deployment infra"
+  type        = string
+  default     = ""
+}
+
+variable "aws" {
+  description = "Workspace name of AWS deployment infra"
+  type        = string
+  default     = ""
+}
+
+variable "gcp" {
+  description = "Workspace name of GCP deployment infra"
+  type        = string
+  default     = ""
+}
diff --git a/xc/versions.tf b/xc/versions.tf
index 268ae0a18..6d361fa91 100644
--- a/xc/versions.tf
+++ b/xc/versions.tf
@@ -7,7 +7,7 @@ terraform {
     }
       azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.18.0"
+      version = ">=3.18.0"
     }
   }
 }
diff --git a/xc/xc_loadbalancer.tf b/xc/xc_loadbalancer.tf
index 769963e0c..19eab935d 100644
--- a/xc/xc_loadbalancer.tf
+++ b/xc/xc_loadbalancer.tf
@@ -372,13 +372,7 @@ resource "volterra_http_loadbalancer" "lb_https" {
           }
           flow_label {
             authentication {
-              login {
-                transaction_result {
-                  failure_conditions {
-                    status = "401"
-                  }
-                }
-              }
+              login { }
             }
           }
         }