diff --git a/charts/alfresco-search-service/Chart.lock b/charts/alfresco-search-service/Chart.lock
index 587fa4b2..7e53e26a 100644
--- a/charts/alfresco-search-service/Chart.lock
+++ b/charts/alfresco-search-service/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 2.0.0
 - name: alfresco-common
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 1.0.0
-digest: sha256:576d7fe1a1a2ba8c99631bdebb6a0cbfd49e2ad84fb639260ba321ddcc312220
-generated: "2023-03-02T11:33:25.548227568Z"
+  version: 2.0.0
+digest: sha256:73ceeccdb51e1b757c9e7067759f748f716667efb9084b456fad43c3367a8cec
+generated: "2023-03-09T11:30:13.663069+01:00"
diff --git a/charts/alfresco-search-service/Chart.yaml b/charts/alfresco-search-service/Chart.yaml
index 8f1dcd3e..f5da7786 100644
--- a/charts/alfresco-search-service/Chart.yaml
+++ b/charts/alfresco-search-service/Chart.yaml
@@ -15,12 +15,12 @@ keywords:
 name: alfresco-search-service
 sources:
   - https://github.com/Alfresco/alfresco-helm-charts
-version: 1.0.1
+version: 1.0.2
 appVersion: 2.0.6
 dependencies:
   - name: alfresco-insight-zeppelin
     version: 2.0.0
     condition: alfresco-insight-zeppelin.enabled
   - name: alfresco-common
-    version: 1.0.0
+    version: 2.0.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
diff --git a/charts/alfresco-search-service/README.md b/charts/alfresco-search-service/README.md
index 0ba58468..04e8de91 100644
--- a/charts/alfresco-search-service/README.md
+++ b/charts/alfresco-search-service/README.md
@@ -1,6 +1,6 @@
 # alfresco-search-service
 
-![Version: 1.0.1](https://img.shields.io/badge/Version-1.0.1-informational?style=flat-square) ![AppVersion: 2.0.6](https://img.shields.io/badge/AppVersion-2.0.6-informational?style=flat-square)
+![Version: 1.0.2](https://img.shields.io/badge/Version-1.0.2-informational?style=flat-square) ![AppVersion: 2.0.6](https://img.shields.io/badge/AppVersion-2.0.6-informational?style=flat-square)
 
 A Helm chart for deploying Alfresco Search Service
 
@@ -17,7 +17,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 | Repository | Name | Version |
 |------------|------|---------|
 |  | alfresco-insight-zeppelin | 2.0.0 |
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 1.0.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 2.0.0 |
 
 ## Values
 
diff --git a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.lock b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.lock
index 236a88a7..c15cb89b 100644
--- a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.lock
+++ b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: alfresco-common
   repository: https://alfresco.github.io/alfresco-helm-charts/
-  version: 1.0.0
-digest: sha256:094ae734b29e6e4735e4b6c3ad786305217cb375570a6a8518395c92f61c23bf
-generated: "2023-02-28T16:18:12.814867+01:00"
+  version: 2.0.0
+digest: sha256:04d458edc1a42ae7a4e4bc73d5872cc5cab9ef5960e5b6226af605a661bff71f
+generated: "2023-03-09T11:31:57.561169+01:00"
diff --git a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.yaml b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.yaml
index d0a6dc4d..7ed09485 100644
--- a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.yaml
+++ b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.yaml
@@ -14,5 +14,5 @@ sources:
 appVersion: 2.0.6
 dependencies:
   - name: alfresco-common
-    version: 1.0.0
+    version: 2.0.0
     repository: https://alfresco.github.io/alfresco-helm-charts/
diff --git a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/README.md b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/README.md
index f0de00de..aa90b61f 100644
--- a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/README.md
+++ b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/README.md
@@ -16,7 +16,7 @@ Please refer to the [documentation](https://github.com/Alfresco/acs-deployment/b
 
 | Repository | Name | Version |
 |------------|------|---------|
-| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 1.0.0 |
+| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 2.0.0 |
 
 ## Values
 
diff --git a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/_helpers.tpl b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/_helpers.tpl
index 67a067ea..afbaf814 100644
--- a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/_helpers.tpl
+++ b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/_helpers.tpl
@@ -17,5 +17,12 @@ Get Alfresco Zeppelin Host
 Get Alfresco Repo Host
 */}}
 {{- define "alfresco-repo-host" -}}
-{{- printf "%s-%s-%s" .Release.Name .Values.repository.host "repository" -}}
+{{- .Values.repository.host | default (printf "%s-repository" (include "content-services.shortname" $)) }}
+{{- end -}}
+
+{{/*
+Get Alfresco Repo Port
+*/}}
+{{- define "alfresco-repo-port" -}}
+{{- .Values.repository.port | default 80 }}
 {{- end -}}
diff --git a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/config.yaml b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/config.yaml
index 291fb9fc..47388578 100644
--- a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/config.yaml
+++ b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/config.yaml
@@ -11,4 +11,4 @@ metadata:
     component: zeppelin
 data:
   REPO_HOST: "{{ template "alfresco-repo-host" . }}"
-  REPO_PORT: "{{ .Values.repository.port }}"
+  REPO_PORT: "{{ template "alfresco-repo-port" . }}"
diff --git a/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/tests/config_test.yaml b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/tests/config_test.yaml
new file mode 100644
index 00000000..cc6efd0e
--- /dev/null
+++ b/charts/alfresco-search-service/charts/alfresco-insight-zeppelin/tests/config_test.yaml
@@ -0,0 +1,30 @@
+---
+suite: test configmaps
+templates:
+  - config.yaml
+tests:
+  - it: should have default port and hosts
+    asserts:
+      - equal:
+          path: data.REPO_HOST
+          value: RELEASE-NAME-alfresco-cs-repository
+        template: config.yaml
+      - equal:
+          path: data.REPO_PORT
+          value: "80"
+        template: config.yaml
+
+  - it: should have provided host and port
+    set:
+      repository:
+        host: somacshost
+        port: 888
+    asserts:
+      - equal:
+          path: data.REPO_HOST
+          value: somacshost
+        template: config.yaml
+      - equal:
+          path: data.REPO_PORT
+          value: "888"
+        template: config.yaml
diff --git a/charts/alfresco-search-service/tests/resources_test.yaml b/charts/alfresco-search-service/tests/resources_test.yaml
new file mode 100644
index 00000000..4e530de9
--- /dev/null
+++ b/charts/alfresco-search-service/tests/resources_test.yaml
@@ -0,0 +1,26 @@
+---
+suite: test resource management
+templates:
+  - deployment.yaml
+  - config.yaml
+tests:
+  - it: should render cpu and memory limits
+    set:
+      resources:
+        requests:
+          cpu: "1"
+          memory: "1500Mi"
+        limits:
+          cpu: "4"
+          memory: "3000Mi"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].resources
+          value:
+            requests:
+              cpu: "1"
+              memory: "1500Mi"
+            limits:
+              cpu: "4"
+              memory: "3000Mi"
+        template: deployment.yaml