diff --git a/helm/ph-ee-fin-back-end/templates/_helpers.tpl b/helm/ph-ee-fin-back-end/templates/test/_helpers.tpl
similarity index 94%
rename from helm/ph-ee-fin-back-end/templates/_helpers.tpl
rename to helm/ph-ee-fin-back-end/templates/test/_helpers.tpl
index cb5329d7..e839a977 100644
--- a/helm/ph-ee-fin-back-end/templates/_helpers.tpl
+++ b/helm/ph-ee-fin-back-end/templates/test/_helpers.tpl
@@ -11,11 +11,11 @@ It directly provides values.
       value: "http://ph-ee-connector-ams-mifos:80"
     - name: LOAN_BASE-URL
       value: "https://fineract-server:8443"
-    - name: "OPERATIONS_APP_CONTACTPOINT"
+    - name: "OPERATIONS-APP_CONTACTPOINT"
       value: "http://ph-ee-operations-app:80"
-    - name: "BULK_PROCESSOR_CONTACTPOINT"
+    - name: "BULK-PROCESSOR_CONTACTPOINT"
       value: "https://ph-ee-connector-bulk:8443"
-    - name: "CHANNEL_CONNECTOR_CONTACTPOINT"
+    - name: "CHANNEL-CONNECTOR_CONTACTPOINT"
       value: "https://ph-ee-connector-channel:8443"
     - name:  "LOGGING_LEVEL_ROOT"
       value: "INFO"
diff --git a/helm/ph-ee-fin-back-end/templates/test/integration-test-ams-and-common.yaml b/helm/ph-ee-fin-back-end/templates/test/integration-test-ams-and-common.yaml
new file mode 100644
index 00000000..3a1684e2
--- /dev/null
+++ b/helm/ph-ee-fin-back-end/templates/test/integration-test-ams-and-common.yaml
@@ -0,0 +1,25 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: g2p-sandbox-test-ams-and-common
+  labels:
+    app: "integration-test-ams-and-common"
+  annotations:
+    "helm.sh/hook": test-success
+spec:
+  containers:
+  - name: g2p-sandbox-test-ams
+    image: "{{.Values.integration_test.image}}"
+    imagePullPolicy: "Always"
+    command: [ "/bin/bash" , "-c" ]
+    args:
+    - ./gradlew test -Dcucumber.filter.tags="@amsIntegration or @common" ; echo 'Test complete' ; sleep 1500 ; echo 'pod terminate'
+    {{- include "inttest.env" . | nindent 4 }}
+    resources:
+      limits:
+        cpu: "800m"
+        memory: "1.2Gi"
+      requests:
+        cpu: "250m"
+        memory: "256Mi"
+  restartPolicy: Never
diff --git a/helm/ph-ee-fin-back-end/values.yaml b/helm/ph-ee-fin-back-end/values.yaml
index 50afeb11..03862c55 100644
--- a/helm/ph-ee-fin-back-end/values.yaml
+++ b/helm/ph-ee-fin-back-end/values.yaml
@@ -139,7 +139,7 @@ ph-ee-engine:
   connector_bulk:
     enabled: true
     operations_app:
-      contactpoint: "http://ph-ee-operations-app:80"
+      contactpoint: "https://ph-ee-operations-app:80"
       endpoints:
         batch_transaction: "/api/v1/batch/transactions"
 
@@ -168,7 +168,7 @@ ph-ee-engine:
   importer_rdbms:
     enabled: true
     LOGGING_LEVEL_ROOT: "DEBUG"
-    SPRING_PROFILES_ACTIVE: "local,tenants"
+    SPRING_PROFILES_ACTIVE: "local,tenants,tenantsConnection"
 
   kong:
     enabled: false
@@ -222,3 +222,6 @@ operations:
     enabled: false
   prometheus:
     enabled: true
+
+integration_test:
+  image: "docker.io/openmf/ph-ee-integration-test:v1.6.5"
diff --git a/safaricom-backend/Chart.yaml b/safaricom-backend/Chart.yaml
new file mode 100644
index 00000000..1259813b
--- /dev/null
+++ b/safaricom-backend/Chart.yaml
@@ -0,0 +1,12 @@
+apiVersion: v2
+name: safaricom-backend
+description: A Helm chart for Kubernetes
+
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
+
+dependencies:
+  - name: back-end
+    repository: "https://fynarfin.io/images/back-end-2.0.0/"
+    version: 2.0.0
diff --git a/safaricom-backend/values.yaml b/safaricom-backend/values.yaml
new file mode 100644
index 00000000..ad2cd102
--- /dev/null
+++ b/safaricom-backend/values.yaml
@@ -0,0 +1,4 @@
+back-end:
+  ph-ee-engine:
+    connector_bulk:
+      enabled: false
diff --git a/safaricom-frontend/Chart.yaml b/safaricom-frontend/Chart.yaml
new file mode 100644
index 00000000..2f799210
--- /dev/null
+++ b/safaricom-frontend/Chart.yaml
@@ -0,0 +1,12 @@
+apiVersion: v2
+name: safaricom-frontend
+description: A Helm chart for Kubernetes
+
+type: application
+version: 0.1.0
+appVersion: "1.16.0"
+
+dependencies:
+  - name: front-end
+    repository: "https://fynarfin.io/images/front-end-2.0.0/"
+    version: 2.0.0
diff --git a/safaricom-frontend/values.yaml b/safaricom-frontend/values.yaml
new file mode 100644
index 00000000..ece4a7e4
--- /dev/null
+++ b/safaricom-frontend/values.yaml
@@ -0,0 +1,4 @@
+front-end:
+  ph-ee-engine:
+    connector_bulk:
+      enabled: false