diff --git a/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/templates/daemonset.yaml b/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/templates/daemonset.yaml
index de17990..23008ff 100644
--- a/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/templates/daemonset.yaml
+++ b/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/templates/daemonset.yaml
@@ -36,7 +36,7 @@ spec:
       {{ end }}
       containers:
       - name: {{ .Chart.Name }}-rabbitmq
-        image: rabbitmq:3-management
+        image: "{{ .Values.notification.image.repository }}:{{ .Values.notification.image.tag }}"
         env:
           - name: THIS_NODE_NAME
             valueFrom:
diff --git a/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml b/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml
index f312a74..e7db92d 100644
--- a/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml
+++ b/stx-ptp-notification-helm/stx-ptp-notification-helm/helm-charts/ptp-notification/values.yaml
@@ -45,6 +45,9 @@ registration:
             - "true"
 
 notification:
+  image:
+    repository: rabbitmq
+    tag: 3.8.11-management
   endpoint:
     port: 5672
     user: admin
@@ -66,7 +69,7 @@ location:
     pullPolicy: IfNotPresent
 
 ptptracking:
-  imagePullSecrets: admin-registry-secret
+  imagePullSecrets: default-registry-key
   image:
     repository: starlingx/notificationservice-base
     tag: stx.5.0-v1.0.3