diff --git a/charts/activemq/Chart.yaml b/charts/activemq/Chart.yaml
index 373a8279..c59686d5 100644
--- a/charts/activemq/Chart.yaml
+++ b/charts/activemq/Chart.yaml
@@ -8,7 +8,7 @@ keywords:
 name: activemq
 sources:
   - https://github.com/Alfresco/alfresco-helm-charts
-version: 3.0.0
+version: 3.0.1
 dependencies:
   - name: alfresco-common
     version: 1.0.0
diff --git a/charts/activemq/README.md b/charts/activemq/README.md
index 0fc6904f..fc732d5b 100644
--- a/charts/activemq/README.md
+++ b/charts/activemq/README.md
@@ -1,6 +1,6 @@
 # activemq
 
-![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![AppVersion: 5.17.1](https://img.shields.io/badge/AppVersion-5.17.1-informational?style=flat-square)
+![Version: 3.0.1](https://img.shields.io/badge/Version-3.0.1-informational?style=flat-square) ![AppVersion: 5.17.1](https://img.shields.io/badge/AppVersion-5.17.1-informational?style=flat-square)
 
 A Helm chart providing a basic Apache ActiveMQ deployment required to evaluate ACS (not meant to be used in production).
 
diff --git a/charts/activemq/templates/svc-activemq-broker.yaml b/charts/activemq/templates/svc-activemq-broker.yaml
index d4135f21..a990428c 100755
--- a/charts/activemq/templates/svc-activemq-broker.yaml
+++ b/charts/activemq/templates/svc-activemq-broker.yaml
@@ -20,5 +20,4 @@ spec:
     name: amqp
     protocol: TCP
   selector:
-    app: {{ template "activemq.fullname" . }}
-    release: {{ .Release.Name }}
+    {{- include "activemq.selectorLabels" . | nindent 4 }}
diff --git a/charts/activemq/templates/svc-activemq-web-console.yaml b/charts/activemq/templates/svc-activemq-web-console.yaml
index 6cd11652..1b381955 100755
--- a/charts/activemq/templates/svc-activemq-web-console.yaml
+++ b/charts/activemq/templates/svc-activemq-web-console.yaml
@@ -12,5 +12,4 @@ spec:
     name: web-console
     protocol: TCP
   selector:
-    app: {{ template "activemq.fullname" . }}
-    release: {{ .Release.Name }}
+    {{- include "activemq.selectorLabels" . | nindent 4 }}
diff --git a/charts/activemq/tests/deployment-activemq_test.yaml b/charts/activemq/tests/deployment-activemq_test.yaml
index e06a004b..440ed695 100644
--- a/charts/activemq/tests/deployment-activemq_test.yaml
+++ b/charts/activemq/tests/deployment-activemq_test.yaml
@@ -1,5 +1,5 @@
 ---
-suite: test activemq persistence
+suite: test activemq deployment
 templates:
   - deployment-activemq.yaml
 tests:
diff --git a/charts/activemq/tests/pv_activemq_test.yaml b/charts/activemq/tests/pvc-activemq_test.yaml
similarity index 99%
rename from charts/activemq/tests/pv_activemq_test.yaml
rename to charts/activemq/tests/pvc-activemq_test.yaml
index a04b504b..9bed2b1c 100644
--- a/charts/activemq/tests/pv_activemq_test.yaml
+++ b/charts/activemq/tests/pvc-activemq_test.yaml
@@ -16,6 +16,7 @@ tests:
               sizeLimit: 20Gi
             name: data
         template: deployment-activemq.yaml
+
   - it: should render a deployment with set claim
     set:
       persistence:
@@ -27,6 +28,7 @@ tests:
             spec.template.spec.volumes[0].persistentVolumeClaim.claimName
           value: mysfsvolume
         template: deployment-activemq.yaml
+
   - it: should render a deployment with dynamic claim name
     set:
       persistence:
@@ -44,6 +46,7 @@ tests:
       - isNull:
           path: spec.storageClassName
         template: pvc-activemq.yaml
+
   - it: should render a deployment with provided storage class
     set:
       persistence:
diff --git a/charts/activemq/tests/svc-activemq_test.yaml b/charts/activemq/tests/svc-activemq_test.yaml
new file mode 100644
index 00000000..206d0177
--- /dev/null
+++ b/charts/activemq/tests/svc-activemq_test.yaml
@@ -0,0 +1,20 @@
+---
+suite: test activemq services
+templates:
+  - svc-activemq-broker.yaml
+  - svc-activemq-web-console.yaml
+tests:
+  - it: should use the default service name
+    asserts:
+      - equal:
+          path: spec.selector
+          value:
+            app.kubernetes.io/instance: RELEASE-NAME
+            app.kubernetes.io/name: activemq
+        template: svc-activemq-broker.yaml
+      - equal:
+          path: spec.selector
+          value:
+            app.kubernetes.io/instance: RELEASE-NAME
+            app.kubernetes.io/name: activemq
+        template: svc-activemq-web-console.yaml