diff --git a/src/main/charts/bamboo/templates/tests/test-application-status.yaml b/src/main/charts/bamboo/templates/tests/test-application-status.yaml
index cc46cda6f..6b313f54e 100644
--- a/src/main/charts/bamboo/templates/tests/test-application-status.yaml
+++ b/src/main/charts/bamboo/templates/tests/test-application-status.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: alpine
+      image: {{ .Values.testPods.image.statusTestContainer }}
       imagePullPolicy: IfNotPresent
       env:
         - name: STATUS_URL
@@ -48,6 +48,10 @@ spec:
             sleep 10
             count=$(( $count + 1 ))
           done
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   restartPolicy: Never
   {{- with .Values.testPods.nodeSelector }}
   nodeSelector:
diff --git a/src/main/charts/bamboo/templates/tests/test-database-connectivity.yaml b/src/main/charts/bamboo/templates/tests/test-database-connectivity.yaml
index dbefd5213..3e7190b88 100644
--- a/src/main/charts/bamboo/templates/tests/test-database-connectivity.yaml
+++ b/src/main/charts/bamboo/templates/tests/test-database-connectivity.yaml
@@ -60,6 +60,10 @@ spec:
           EOF
           cat output.txt
           grep -q "Connection established OK" output.txt
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   restartPolicy: Never
   {{- with .Values.testPods.nodeSelector }}
   nodeSelector:
diff --git a/src/main/charts/bamboo/templates/tests/test-shared-home-permissions.yaml b/src/main/charts/bamboo/templates/tests/test-shared-home-permissions.yaml
index d97e59285..e00191635 100644
--- a/src/main/charts/bamboo/templates/tests/test-shared-home-permissions.yaml
+++ b/src/main/charts/bamboo/templates/tests/test-shared-home-permissions.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: debian:stable-slim
+      image: {{ .Values.testPods.image.permissionsTestContainer }}
       imagePullPolicy: IfNotPresent
       securityContext:
         # We assume that the UID and GID used by the product images are the same, which in practice they are
@@ -51,6 +51,10 @@ spec:
           touch /shared-home/permissions-test
           ls -l /shared-home/permissions-test
           rm /shared-home/permissions-test
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   volumes:
     {{ include "bamboo.volumes.sharedHome" . | nindent 4 }}
   restartPolicy: Never
diff --git a/src/main/charts/bamboo/values.yaml b/src/main/charts/bamboo/values.yaml
index b3c99dd2f..c217a7499 100644
--- a/src/main/charts/bamboo/values.yaml
+++ b/src/main/charts/bamboo/values.yaml
@@ -1205,6 +1205,7 @@ atlassianAnalyticsAndSupport:
 # -- Metadata and pod spec for pods started in Helm tests
 #
 testPods:
+  resources: {}
   labels: {}
   annotations: {}
   nodeSelector: {}
diff --git a/src/main/charts/bitbucket/templates/tests/test-application-status.yaml b/src/main/charts/bitbucket/templates/tests/test-application-status.yaml
index 719d44606..8612473da 100644
--- a/src/main/charts/bitbucket/templates/tests/test-application-status.yaml
+++ b/src/main/charts/bitbucket/templates/tests/test-application-status.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: alpine
+      image: {{ .Values.testPods.image.statusTestContainer }}
       imagePullPolicy: IfNotPresent
       env:
         - name: STATUS_URL
@@ -36,6 +36,10 @@ spec:
           STATUS=$(curl -s "$STATUS_URL")
           echo "Verifying application state is RUNNING or FIRST_RUN: $STATUS"
           echo $STATUS | jq -e '.state|test("RUNNING|FIRST_RUN")'
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   restartPolicy: Never
   {{- with .Values.testPods.nodeSelector }}
   nodeSelector:
diff --git a/src/main/charts/bitbucket/templates/tests/test-database-connectivity.yaml b/src/main/charts/bitbucket/templates/tests/test-database-connectivity.yaml
index 6161deac5..ebf698c40 100644
--- a/src/main/charts/bitbucket/templates/tests/test-database-connectivity.yaml
+++ b/src/main/charts/bitbucket/templates/tests/test-database-connectivity.yaml
@@ -64,6 +64,10 @@ spec:
           EOF
           cat output.txt
           grep -q "Connection established OK" output.txt
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   restartPolicy: Never
   {{- with .Values.testPods.nodeSelector }}
   nodeSelector:
diff --git a/src/main/charts/bitbucket/templates/tests/test-shared-home-permissions.yaml b/src/main/charts/bitbucket/templates/tests/test-shared-home-permissions.yaml
index f6dc10f94..9313b7d09 100644
--- a/src/main/charts/bitbucket/templates/tests/test-shared-home-permissions.yaml
+++ b/src/main/charts/bitbucket/templates/tests/test-shared-home-permissions.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: debian:stable-slim
+      image: {{ .Values.testPods.image.permissionsTestContainer }}
       imagePullPolicy: IfNotPresent
       securityContext:
         # We assume that the UID and GID used by the product images are the same, which in practice they are
@@ -60,6 +60,10 @@ spec:
           touch /shared-home/permissions-test
           ls -l /shared-home/permissions-test
           rm /shared-home/permissions-test
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   volumes:
     {{- if or .Values.volumes.sharedHome.persistentVolumeClaim.create .Values.volumes.sharedHome.customVolume }}
     {{ include "bitbucket.volumes.sharedHome" . | nindent 4 }}
diff --git a/src/main/charts/bitbucket/values.yaml b/src/main/charts/bitbucket/values.yaml
index ce581f9d3..1b2e51005 100644
--- a/src/main/charts/bitbucket/values.yaml
+++ b/src/main/charts/bitbucket/values.yaml
@@ -1526,6 +1526,7 @@ atlassianAnalyticsAndSupport:
 # -- Metadata and pod spec for pods started in Helm tests
 #
 testPods:
+  resources: {}
   labels: {}
   annotations: {}
   nodeSelector: {}
diff --git a/src/main/charts/confluence/templates/tests/test-application-status.yaml b/src/main/charts/confluence/templates/tests/test-application-status.yaml
index 10ff2eafb..5f2787ea6 100644
--- a/src/main/charts/confluence/templates/tests/test-application-status.yaml
+++ b/src/main/charts/confluence/templates/tests/test-application-status.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: alpine
+      image: {{ .Values.testPods.image.statusTestContainer }}
       env:
         - name: STATUS_URL
           value: "http://{{ include "common.names.fullname" . }}:{{ .Values.confluence.service.port }}/status"
@@ -35,6 +35,10 @@ spec:
           STATUS=$(curl -s "$STATUS_URL")
           echo "Verifying application state is RUNNING or FIRST_RUN: $STATUS"
           echo $STATUS | jq -e '.state|test("RUNNING|FIRST_RUN")'
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   restartPolicy: Never
   {{- with .Values.testPods.nodeSelector }}
   nodeSelector:
diff --git a/src/main/charts/confluence/templates/tests/test-database-connectivity.yaml b/src/main/charts/confluence/templates/tests/test-database-connectivity.yaml
index b05617d7b..a4030f08a 100644
--- a/src/main/charts/confluence/templates/tests/test-database-connectivity.yaml
+++ b/src/main/charts/confluence/templates/tests/test-database-connectivity.yaml
@@ -64,6 +64,10 @@ spec:
           EOF
           cat output.txt
           grep -q "Connection established OK" output.txt
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   restartPolicy: Never
   {{- with .Values.testPods.nodeSelector }}
   nodeSelector:
diff --git a/src/main/charts/confluence/templates/tests/test-shared-home-permissions.yaml b/src/main/charts/confluence/templates/tests/test-shared-home-permissions.yaml
index fa1f55007..e06f0acf2 100644
--- a/src/main/charts/confluence/templates/tests/test-shared-home-permissions.yaml
+++ b/src/main/charts/confluence/templates/tests/test-shared-home-permissions.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: debian:stable-slim
+      image: {{ .Values.testPods.image.permissionsTestContainer }}
       imagePullPolicy: IfNotPresent
       securityContext:
         # We assume that the UID and GID used by the product images are the same, which in practice they are
@@ -54,6 +54,10 @@ spec:
           touch /shared-home/permissions-test
           ls -l /shared-home/permissions-test
           rm /shared-home/permissions-test
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   volumes:
     {{ include "confluence.volumes.sharedHome" . | nindent 4 }}
   restartPolicy: Never
diff --git a/src/main/charts/confluence/values.yaml b/src/main/charts/confluence/values.yaml
index 1775824a7..0cd8b2c42 100644
--- a/src/main/charts/confluence/values.yaml
+++ b/src/main/charts/confluence/values.yaml
@@ -1551,6 +1551,7 @@ atlassianAnalyticsAndSupport:
 # -- Metadata and pod spec for pods started in Helm tests
 #
 testPods:
+  resources: {}
   labels: {}
   annotations: {}
   nodeSelector: {}
diff --git a/src/main/charts/crowd/templates/tests/test-application-status.yaml b/src/main/charts/crowd/templates/tests/test-application-status.yaml
index db39300cd..b43d8f233 100644
--- a/src/main/charts/crowd/templates/tests/test-application-status.yaml
+++ b/src/main/charts/crowd/templates/tests/test-application-status.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: alpine
+      image: {{ .Values.testPods.image.statusTestContainer }}
       env:
         - name: STATUS_URL
           value: "http://{{ include "common.names.fullname" . }}:{{ .Values.crowd.service.port }}/crowd/status"
@@ -35,6 +35,10 @@ spec:
           STATUS=$(curl -s "$STATUS_URL")
           echo "Verifying application state is RUNNING or FIRST_RUN: $STATUS"
           echo $STATUS | jq -e '.state|test("RUNNING|FIRST_RUN")'
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   restartPolicy: Never
   {{- with .Values.testPods.nodeSelector }}
   nodeSelector:
diff --git a/src/main/charts/crowd/templates/tests/test-shared-home-permissions.yaml b/src/main/charts/crowd/templates/tests/test-shared-home-permissions.yaml
index 93b62bc64..0c32aa200 100644
--- a/src/main/charts/crowd/templates/tests/test-shared-home-permissions.yaml
+++ b/src/main/charts/crowd/templates/tests/test-shared-home-permissions.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: debian:stable-slim
+      image: {{ .Values.testPods.image.permissionsTestContainer }}
       imagePullPolicy: IfNotPresent
       securityContext:
         # We assume that the UID and GID used by the product images are the same, which in practice they are
@@ -54,6 +54,10 @@ spec:
           touch /shared-home/permissions-test
           ls -l /shared-home/permissions-test
           rm /shared-home/permissions-test
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   volumes:
     {{ include "crowd.volumes.sharedHome" . | nindent 4 }}
   restartPolicy: Never
diff --git a/src/main/charts/crowd/values.yaml b/src/main/charts/crowd/values.yaml
index 7a8630300..dbf10b26c 100644
--- a/src/main/charts/crowd/values.yaml
+++ b/src/main/charts/crowd/values.yaml
@@ -1005,6 +1005,7 @@ atlassianAnalyticsAndSupport:
 # -- Metadata and pod spec for pods started in Helm tests
 #
 testPods:
+  resources: {}
   labels: {}
   annotations: {}
   nodeSelector: {}
diff --git a/src/main/charts/jira/templates/tests/test-application-status.yaml b/src/main/charts/jira/templates/tests/test-application-status.yaml
index e15de8fdb..f75d6e04b 100644
--- a/src/main/charts/jira/templates/tests/test-application-status.yaml
+++ b/src/main/charts/jira/templates/tests/test-application-status.yaml
@@ -36,6 +36,10 @@ spec:
           STATUS=$(curl -s "$STATUS_URL")
           echo "Verifying application state is RUNNING or FIRST_RUN: $STATUS"
           echo $STATUS | jq -e '.state|test("RUNNING|FIRST_RUN")'
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   restartPolicy: Never
   {{- with .Values.testPods.nodeSelector }}
   nodeSelector:
diff --git a/src/main/charts/jira/templates/tests/test-database-connectivity.yaml b/src/main/charts/jira/templates/tests/test-database-connectivity.yaml
index ce406c748..2dbecc74a 100644
--- a/src/main/charts/jira/templates/tests/test-database-connectivity.yaml
+++ b/src/main/charts/jira/templates/tests/test-database-connectivity.yaml
@@ -64,6 +64,10 @@ spec:
           EOF
           cat output.txt
           grep -q "Connection established OK" output.txt
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   restartPolicy: Never
   {{- with .Values.testPods.nodeSelector }}
   nodeSelector:
diff --git a/src/main/charts/jira/templates/tests/test-shared-home-permissions.yaml b/src/main/charts/jira/templates/tests/test-shared-home-permissions.yaml
index 8be5c96e6..83be006e9 100644
--- a/src/main/charts/jira/templates/tests/test-shared-home-permissions.yaml
+++ b/src/main/charts/jira/templates/tests/test-shared-home-permissions.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: debian:stable-slim
+      image: {{ .Values.testPods.image.permissionsTestContainer }}
       imagePullPolicy: IfNotPresent
       securityContext:
         # We assume that the UID and GID used by the product images are the same, which in practice they are
@@ -54,6 +54,10 @@ spec:
           touch /shared-home/permissions-test
           ls -l /shared-home/permissions-test
           rm /shared-home/permissions-test
+      {{- with .Values.testPods.resources }}
+      resources:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
   volumes:
     {{ include "jira.volumes.sharedHome" . | nindent 4 }}
   restartPolicy: Never
diff --git a/src/main/charts/jira/values.yaml b/src/main/charts/jira/values.yaml
index 6a6683886..a21d32431 100644
--- a/src/main/charts/jira/values.yaml
+++ b/src/main/charts/jira/values.yaml
@@ -1180,6 +1180,7 @@ atlassianAnalyticsAndSupport:
 # -- Metadata and pod spec for pods started in Helm tests
 #
 testPods:
+  resources: {}
   labels: {}
   annotations: {}
   nodeSelector: {}
diff --git a/src/test/java/test/TestPodsTest.java b/src/test/java/test/TestPodsTest.java
index 4bbf24282..c472c5431 100644
--- a/src/test/java/test/TestPodsTest.java
+++ b/src/test/java/test/TestPodsTest.java
@@ -141,9 +141,42 @@ void test_pods_custom_scheduler_name(Product product) throws Exception {
         for (String testPod : testPods) {
             final var pod = resources.get(Kind.Pod, Pod.class, product.getHelmReleaseName() + "-" + testPod);
             assertEquals("my-scheduler", pod.getSpec().path("schedulerName").asText());
+        }
+    }
 
+    @ParameterizedTest
+    @EnumSource(value = Product.class, names = {"bamboo_agent"}, mode = EnumSource.Mode.EXCLUDE)
+    void test_pods_custom_resources(Product product) throws Exception {
+        final var resources = helm.captureKubeResourcesFromHelmChart(product, Map.of(
+                "database.credentials.secretName", "db-secret",
+                "testPods.resources.requests.cpu", "1",
+                "testPods.resources.limits.cpu", "2",
+                "testPods.resources.requests.memory", "2Mi",
+                "testPods.resources.limits.memory", "3Mi"));
+        List<String> testPods = List.of("application-status-test", "shared-home-permissions-test", "db-connectivity-test");
+        if (product.name().equals("crowd")) {
+            testPods = List.of("application-status-test", "shared-home-permissions-test");
         }
+        for (String testPod : testPods) {
+            final var pod = resources.get(Kind.Pod, Pod.class, product.getHelmReleaseName() + "-" + testPod);
+            assertEquals("1", pod.getSpec().path("containers").path(0).path("resources").path("requests").path("cpu").asText());
+            assertEquals("2", pod.getSpec().path("containers").path(0).path("resources").path("limits").path("cpu").asText());
+            assertEquals("2Mi", pod.getSpec().path("containers").path(0).path("resources").path("requests").path("memory").asText());
+            assertEquals("3Mi", pod.getSpec().path("containers").path(0).path("resources").path("limits").path("memory").asText());
+        }
+    }
 
+    @ParameterizedTest
+    @EnumSource(value = Product.class, names = {"bamboo_agent"}, mode = EnumSource.Mode.EXCLUDE)
+    void test_pods_custom_images(Product product) throws Exception {
+        final var resources = helm.captureKubeResourcesFromHelmChart(product, Map.of(
+                "testPods.image.statusTestContainer", "centos",
+                "testPods.image.permissionsTestContainer", "centos"));
+        List<String> testPods = List.of("application-status-test", "shared-home-permissions-test");
+        for (String testPod : testPods) {
+            final var pod = resources.get(Kind.Pod, Pod.class, product.getHelmReleaseName() + "-" + testPod);
+            assertEquals("centos", pod.getSpec().path("containers").path(0).path("image").asText());
+        }
     }
 
     @ParameterizedTest
diff --git a/src/test/resources/expected_helm_output/bamboo-agent/output.yaml b/src/test/resources/expected_helm_output/bamboo-agent/output.yaml
index 45c693549..1f8aac48a 100644
--- a/src/test/resources/expected_helm_output/bamboo-agent/output.yaml
+++ b/src/test/resources/expected_helm_output/bamboo-agent/output.yaml
@@ -46,6 +46,7 @@ spec:
   template:
     metadata:
       annotations:
+        checksum/config-jvm: 42513a28cc58777860ccf2d5c400fbd10c83d85a39e7bc4535e18bb0b6bd39ad
       labels:
         app.kubernetes.io/name: bamboo-agent
         app.kubernetes.io/instance: unittest-bamboo-agent
diff --git a/src/test/resources/expected_helm_output/bamboo/output.yaml b/src/test/resources/expected_helm_output/bamboo/output.yaml
index 79b601cda..1b0169905 100644
--- a/src/test/resources/expected_helm_output/bamboo/output.yaml
+++ b/src/test/resources/expected_helm_output/bamboo/output.yaml
@@ -83,7 +83,7 @@ data:
     affinity: {}
     atlassianAnalyticsAndSupport:
       analytics:
-        enabled: true
+        enabled: false
       helmValues:
         enabled: true
     bamboo:
@@ -267,6 +267,7 @@ data:
         statusTestContainer: alpine:latest
       labels: {}
       nodeSelector: {}
+      resources: {}
       schedulerName: null
       tolerations: []
     tolerations: []
@@ -301,19 +302,6 @@ data:
               storage: 1Gi
           storageClassName: null
         subPath: null
-  analytics.json: |
-    {
-      "imageTag": "9.5.1",
-      "replicas": 1,
-      "isJmxEnabled": true,
-      "ingressType": "NONE",
-      "k8sVersion": "1.28",
-      "serviceType": "CLUSTER_IP",
-      "dbType": "UNKNOWN",
-      "isSharedHomePVCCreated": false,
-      "isServiceMonitorCreated": false,
-      "isGrafanaDashboardsCreated": false
-    }
 ---
 # Source: bamboo/templates/service-jms.yaml
 apiVersion: v1
@@ -405,6 +393,7 @@ spec:
   template:
     metadata:
       annotations:
+        checksum/config-jvm: d0d822938d8d28725b077e578cd2dda282aee43dab7100c16aed24e2e8b620a6
       labels:
         app.kubernetes.io/name: bamboo
         app.kubernetes.io/instance: unittest-bamboo
@@ -575,7 +564,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: alpine
+      image: alpine:latest
       imagePullPolicy: IfNotPresent
       env:
         - name: STATUS_URL
diff --git a/src/test/resources/expected_helm_output/bamboo/values.yaml b/src/test/resources/expected_helm_output/bamboo/values.yaml
index 66e48f05a..137df467c 100644
--- a/src/test/resources/expected_helm_output/bamboo/values.yaml
+++ b/src/test/resources/expected_helm_output/bamboo/values.yaml
@@ -40,3 +40,7 @@ additionalHosts:
 
 monitoring:
   exposeJmxMetrics: true
+
+atlassianAnalyticsAndSupport:
+  analytics:
+    enabled: false
\ No newline at end of file
diff --git a/src/test/resources/expected_helm_output/bitbucket/output.yaml b/src/test/resources/expected_helm_output/bitbucket/output.yaml
index d6f71ed20..8b1f86040 100644
--- a/src/test/resources/expected_helm_output/bitbucket/output.yaml
+++ b/src/test/resources/expected_helm_output/bitbucket/output.yaml
@@ -96,7 +96,7 @@ data:
     affinity: {}
     atlassianAnalyticsAndSupport:
       analytics:
-        enabled: true
+        enabled: false
       helmValues:
         enabled: true
     bitbucket:
@@ -351,6 +351,7 @@ data:
         statusTestContainer: alpine:latest
       labels: {}
       nodeSelector: {}
+      resources: {}
       schedulerName: null
       tolerations: []
     tolerations: []
@@ -393,21 +394,6 @@ data:
           storageClassName: null
           volumeName: null
         subPath: null
-  analytics.json: |
-    {
-      "imageTag": "8.9.10",
-      "replicas": 1,
-      "isJmxEnabled": true,
-      "ingressType": "NONE",
-      "k8sVersion": "1.28",
-      "serviceType": "CLUSTER_IP",
-      "dbType": "UNKNOWN",
-      "isClusteringEnabled": false,
-      "isSharedHomePVCCreated": false,
-      "isServiceMonitorCreated": false,
-      "isGrafanaDashboardsCreated": false,
-      "isBitbucketMeshEnabled": true
-    }
 ---
 # Source: bitbucket/templates/service-jmx.yaml
 apiVersion: v1
@@ -567,6 +553,7 @@ spec:
   template:
     metadata:
       annotations:
+        checksum/config-jvm: 00c520ede640b3befa36e128275315222fdc74665fdfeb29d5a87a74cff3549c
       labels:
         app.kubernetes.io/name: bitbucket-mesh
         app.kubernetes.io/instance: unittest-bitbucket
@@ -689,6 +676,7 @@ spec:
   template:
     metadata:
       annotations:
+        checksum/config-jvm: dc3c40202986b19d8c8108c0fe3b467e8277fb8b1be897185b5cff3725550d12
       labels:
         app.kubernetes.io/name: bitbucket
         app.kubernetes.io/instance: unittest-bitbucket
@@ -818,7 +806,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: alpine
+      image: alpine:latest
       imagePullPolicy: IfNotPresent
       env:
         - name: STATUS_URL
diff --git a/src/test/resources/expected_helm_output/bitbucket/values.yaml b/src/test/resources/expected_helm_output/bitbucket/values.yaml
index f5515435d..c98ef9552 100644
--- a/src/test/resources/expected_helm_output/bitbucket/values.yaml
+++ b/src/test/resources/expected_helm_output/bitbucket/values.yaml
@@ -18,3 +18,7 @@ additionalHosts:
 
 monitoring:
   exposeJmxMetrics: true
+
+atlassianAnalyticsAndSupport:
+  analytics:
+    enabled: false
diff --git a/src/test/resources/expected_helm_output/confluence/output.yaml b/src/test/resources/expected_helm_output/confluence/output.yaml
index 841ff1c3b..575787dd6 100644
--- a/src/test/resources/expected_helm_output/confluence/output.yaml
+++ b/src/test/resources/expected_helm_output/confluence/output.yaml
@@ -82,7 +82,7 @@ data:
     affinity: {}
     atlassianAnalyticsAndSupport:
       analytics:
-        enabled: true
+        enabled: false
       helmValues:
         enabled: true
     common:
@@ -337,6 +337,7 @@ data:
         statusTestContainer: alpine:latest
       labels: {}
       nodeSelector: {}
+      resources: {}
       schedulerName: null
       tolerations: []
     tolerations: []
@@ -385,21 +386,6 @@ data:
         persistentVolumeClaimRetentionPolicy:
           whenDeleted: null
           whenScaled: null
-  analytics.json: |
-    {
-      "imageTag": "8.5.6",
-      "replicas": 1,
-      "isJmxEnabled": true,
-      "ingressType": "NONE",
-      "k8sVersion": "1.28",
-      "serviceType": "CLUSTER_IP",
-      "dbType": "UNKNOWN",
-      "isS3AttachmentsStorageEnabled":false,
-      "isClusteringEnabled": false,
-      "isSharedHomePVCCreated": false,
-      "isServiceMonitorCreated": false,
-      "isGrafanaDashboardsCreated": false
-    }
 ---
 # Source: confluence/templates/synchrony-start-script.yaml
 apiVersion: v1
@@ -521,6 +507,7 @@ spec:
   template:
     metadata:
       annotations:
+        checksum/config-jvm: 5c7e4f3183d49bd4e8c82a29b06246e551e4120042495652f1f9b27a0599a882
       labels:
         app.kubernetes.io/name: confluence-synchrony
         app.kubernetes.io/instance: unittest-confluence
@@ -602,6 +589,7 @@ spec:
   template:
     metadata:
       annotations:
+        checksum/config-jvm: 42ee4051926037deb7903180f86089e0be2b186d976dc3f47411c8962d8beb40
       labels:
         app.kubernetes.io/name: confluence
         app.kubernetes.io/instance: unittest-confluence
@@ -740,7 +728,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: alpine
+      image: alpine:latest
       env:
         - name: STATUS_URL
           value: "http://unittest-confluence:80/status"
diff --git a/src/test/resources/expected_helm_output/confluence/values.yaml b/src/test/resources/expected_helm_output/confluence/values.yaml
index 72f67dd8e..6beff55c6 100644
--- a/src/test/resources/expected_helm_output/confluence/values.yaml
+++ b/src/test/resources/expected_helm_output/confluence/values.yaml
@@ -17,3 +17,6 @@ priorityClassName: "high"
 monitoring:
   exposeJmxMetrics: true
 
+atlassianAnalyticsAndSupport:
+  analytics:
+    enabled: false
diff --git a/src/test/resources/expected_helm_output/crowd/output.yaml b/src/test/resources/expected_helm_output/crowd/output.yaml
index 59c1cfd4f..bf3df34eb 100644
--- a/src/test/resources/expected_helm_output/crowd/output.yaml
+++ b/src/test/resources/expected_helm_output/crowd/output.yaml
@@ -85,7 +85,7 @@ data:
     affinity: {}
     atlassianAnalyticsAndSupport:
       analytics:
-        enabled: true
+        enabled: false
       helmValues:
         enabled: true
     common:
@@ -237,6 +237,7 @@ data:
         statusTestContainer: alpine:latest
       labels: {}
       nodeSelector: {}
+      resources: {}
       schedulerName: null
       tolerations: []
     tolerations: []
@@ -271,19 +272,6 @@ data:
               storage: 1Gi
           storageClassName: null
         subPath: null
-  analytics.json: |
-    {
-      "imageTag": "5.2.3",
-      "replicas": 1,
-      "isJmxEnabled": true,
-      "ingressType": "NONE",
-      "k8sVersion": "1.28",
-      "serviceType": "CLUSTER_IP",
-      "dbType": "UNKNOWN",
-      "isSharedHomePVCCreated": false,
-      "isServiceMonitorCreated": false,
-      "isGrafanaDashboardsCreated": false
-    }
 ---
 # Source: crowd/templates/service-jmx.yaml
 apiVersion: v1
@@ -352,6 +340,7 @@ spec:
   template:
     metadata:
       annotations:
+        checksum/config-jvm: 383d0385319b80eef29acd67ca2c538f526b1ebcb262ca25a55dc12f9ce050bf
       labels:
         app.kubernetes.io/name: crowd
         app.kubernetes.io/instance: unittest-crowd
@@ -487,7 +476,7 @@ metadata:
 spec:
   containers:
     - name: test
-      image: alpine
+      image: alpine:latest
       env:
         - name: STATUS_URL
           value: "http://unittest-crowd:80/crowd/status"
diff --git a/src/test/resources/expected_helm_output/crowd/values.yaml b/src/test/resources/expected_helm_output/crowd/values.yaml
index 3eae98a42..a5a516875 100644
--- a/src/test/resources/expected_helm_output/crowd/values.yaml
+++ b/src/test/resources/expected_helm_output/crowd/values.yaml
@@ -15,3 +15,7 @@ additionalHosts:
 
 monitoring:
   exposeJmxMetrics: true
+
+atlassianAnalyticsAndSupport:
+  analytics:
+    enabled: false
diff --git a/src/test/resources/expected_helm_output/jira/output.yaml b/src/test/resources/expected_helm_output/jira/output.yaml
index bcd0564ec..2b03ef5b6 100644
--- a/src/test/resources/expected_helm_output/jira/output.yaml
+++ b/src/test/resources/expected_helm_output/jira/output.yaml
@@ -83,7 +83,7 @@ data:
     affinity: {}
     atlassianAnalyticsAndSupport:
       analytics:
-        enabled: true
+        enabled: false
       helmValues:
         enabled: true
     common:
@@ -274,6 +274,7 @@ data:
         statusTestContainer: alpine:latest
       labels: {}
       nodeSelector: {}
+      resources: {}
       schedulerName: null
       tolerations: []
     tolerations: []
@@ -308,21 +309,6 @@ data:
               storage: 1Gi
           storageClassName: null
         subPath: null
-  analytics.json: |
-    {
-      "imageTag": "9.12.3",
-      "replicas": 1,
-      "isJmxEnabled": true,
-      "ingressType": "NONE",
-      "k8sVersion": "1.28",
-      "isS3AvatarsEnabled": false,
-      "serviceType": "CLUSTER_IP",
-      "dbType": "UNKNOWN",
-      "isClusteringEnabled": false,
-      "isSharedHomePVCCreated": false,
-      "isServiceMonitorCreated": false,
-      "isGrafanaDashboardsCreated": false
-    }
 ---
 # Source: jira/templates/service-jmx.yaml
 apiVersion: v1
@@ -391,6 +377,7 @@ spec:
   template:
     metadata:
       annotations:
+        checksum/config-jvm: d293aeef116388ad949f4391230a6dcf1e10dde3d92cc7ba0560b2f1f1f7bcc2
       labels:
         app.kubernetes.io/name: jira
         app.kubernetes.io/instance: unittest-jira
diff --git a/src/test/resources/expected_helm_output/jira/values.yaml b/src/test/resources/expected_helm_output/jira/values.yaml
index 1821a5874..b7fb4cd80 100644
--- a/src/test/resources/expected_helm_output/jira/values.yaml
+++ b/src/test/resources/expected_helm_output/jira/values.yaml
@@ -14,3 +14,7 @@ priorityClassName: "high"
 
 monitoring:
   exposeJmxMetrics: true
+
+atlassianAnalyticsAndSupport:
+  analytics:
+    enabled: false