diff --git a/.circleci/config.yml b/.circleci/config.yml
index 911a051a..02554fbc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -437,7 +437,7 @@ workflows:
             - slack
       - host-g2-sandbox-security-fynarfin-chart:
           requires:
-            - build
+            - build-g2p-sandbox-ci-chart
           context:
             - AWS
             - Helm
diff --git a/helm/ph-ee-g2p-sandbox-ci/values_p1.yaml b/helm/ph-ee-g2p-sandbox-ci/values_p1.yaml
index e1b1733f..52731ad3 100644
--- a/helm/ph-ee-g2p-sandbox-ci/values_p1.yaml
+++ b/helm/ph-ee-g2p-sandbox-ci/values_p1.yaml
@@ -20,19 +20,12 @@ ph-ee-g2psandbox:
       enabled: false
     importer_rdbms:
       enabled: false
-    importer_es:
-      enabled: false
     mockpayment:
       enabled: false
     post_installation_job:
       enabled: false
     kibana:
       enabled: false
-    kafka:
-      global:
-        storageClass: standard
-      provisioning:
-        enabled: false
     messagegateway:
       enabled: false
     notifications:
diff --git a/helm/ph-ee-g2p-sandbox-ci/values_p2.yaml b/helm/ph-ee-g2p-sandbox-ci/values_p2.yaml
index e0490e40..12ac6d57 100644
--- a/helm/ph-ee-g2p-sandbox-ci/values_p2.yaml
+++ b/helm/ph-ee-g2p-sandbox-ci/values_p2.yaml
@@ -16,17 +16,10 @@ ph-ee-g2psandbox:
       enabled: false
     importer_rdbms:
       enabled: false
-    importer_es:
-      enabled: false
     mockpayment:
       enabled: false
     kibana:
       enabled: false
-    kafka:
-      provisioning:
-        enabled: false
-      global:
-        storageClass: standard
     messagegateway:
       enabled: false
     notifications:
diff --git a/helm/ph-ee-g2p-sandbox-ci/values_p3.yaml b/helm/ph-ee-g2p-sandbox-ci/values_p3.yaml
index 1cd4dda7..c25bcbc3 100644
--- a/helm/ph-ee-g2p-sandbox-ci/values_p3.yaml
+++ b/helm/ph-ee-g2p-sandbox-ci/values_p3.yaml
@@ -10,6 +10,3 @@
        enabled: false
      operations_web:
        enabled: false
-     kafka:
-       provisioning:
-         enabled: false
diff --git a/helm/ph-ee-g2p-sandbox-ci/values_resource.yaml b/helm/ph-ee-g2p-sandbox-ci/values_resource.yaml
index f4121acc..5473451b 100644
--- a/helm/ph-ee-g2p-sandbox-ci/values_resource.yaml
+++ b/helm/ph-ee-g2p-sandbox-ci/values_resource.yaml
@@ -90,6 +90,10 @@ ph-ee-g2psandbox:
           size: "4Gi"
         readinessProbe:
           initialDelaySeconds: 5
+      global:
+        storageClass: standard
+      provisioning:
+        enabled: false
     importer_rdbms:
       readinessProbe:
         initialDelaySeconds: 180