diff --git a/helm/charts/opencoze/templates/mysql-init-job.yaml b/helm/charts/opencoze/templates/mysql-init-job.yaml
index cdb81626..4448948b 100644
--- a/helm/charts/opencoze/templates/mysql-init-job.yaml
+++ b/helm/charts/opencoze/templates/mysql-init-job.yaml
@@ -12,15 +12,15 @@ spec:
       initContainers:
       - name: wait-for-mysql
         image: {{ .Values.images.busybox }}
-        command: ['sh', '-c', 'until nc -z {{ .Release.Name }}-mysql 3306; do echo waiting for mysql; sleep 2; done']
+        command: ['sh', '-c', 'until nc -z {{ include "opencoze.fullname" . }}-mysql 3306; do echo waiting for mysql; sleep 2; done']
       - name: sql-init
         image: "{{ .Values.mysql.image.repository }}:{{ .Values.mysql.image.tag }}"
         command:
         - "/bin/sh"
         - "-c"
         - |
-          mysql -h {{ .Release.Name }}-mysql -u root -p"{{ .Values.mysql.rootPassword }}" -e "CREATE USER IF NOT EXISTS '{{ .Values.mysql.user }}'@'%' IDENTIFIED BY '{{ .Values.mysql.password }}';GRANT ALL PRIVILEGES ON {{ .Values.mysql.database }}.* TO '{{ .Values.mysql.user }}'@'%';FLUSH PRIVILEGES;"
-          mysql -h {{ .Release.Name }}-mysql -u {{ .Values.mysql.user }} -p"{{ .Values.mysql.password }}" {{ .Values.mysql.database }} < /sql/schema.sql
+          mysql -h {{ include "opencoze.fullname" . }}-mysql -u root -p"{{ .Values.mysql.rootPassword }}" -e "CREATE USER IF NOT EXISTS '{{ .Values.mysql.user }}'@'%' IDENTIFIED BY '{{ .Values.mysql.password }}';GRANT ALL PRIVILEGES ON {{ .Values.mysql.database }}.* TO '{{ .Values.mysql.user }}'@'%';FLUSH PRIVILEGES;"
+          mysql -h {{ include "opencoze.fullname" . }}-mysql -u {{ .Values.mysql.user }} -p"{{ .Values.mysql.password }}" {{ .Values.mysql.database }} < /sql/schema.sql
         volumeMounts:
         - name: schema-sql
           mountPath: /sql/schema.sql
diff --git a/helm/charts/opencoze/templates/rocketmq-broker-statefulset.yaml b/helm/charts/opencoze/templates/rocketmq-broker-statefulset.yaml
index f19e4689..9f9d7a5e 100644
--- a/helm/charts/opencoze/templates/rocketmq-broker-statefulset.yaml
+++ b/helm/charts/opencoze/templates/rocketmq-broker-statefulset.yaml
@@ -23,7 +23,7 @@ spec:
       initContainers:
         - name: wait-for-namesrv
           image: "{{ .Values.images.busybox }}"
-          command: ['sh', '-c', 'until nc -z {{ .Release.Name }}-rocketmq-namesrv 9876; do echo waiting for namesrv; sleep 2; done']
+          command: ['sh', '-c', 'until nc -z {{ include "opencoze.fullname" . }}-rocketmq-namesrv 9876; do echo waiting for namesrv; sleep 2; done']
       volumes:
         - name: broker-config
           configMap: