diff --git a/addons/rabbitmq/config/rabbitmq-env.tpl b/addons/rabbitmq/config/rabbitmq-env.tpl
deleted file mode 100644
index 4faed7ad7..000000000
--- a/addons/rabbitmq/config/rabbitmq-env.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{- $rabbitmq_port_info := getPortByName ( index $.podSpec.containers 0 ) "amqp" }}
-
-## for rabbitmq port
-{{- $rabbitmq_port := 5672 }}
-{{- if $rabbitmq_port_info }}
-  {{- $rabbitmq_port = $rabbitmq_port_info.containerPort }}
-{{- end }}
-SERVICE_PORT: {{ $rabbitmq_port }}
diff --git a/addons/rabbitmq/templates/_helpers.tpl b/addons/rabbitmq/templates/_helpers.tpl
index 0699a8c57..d1ac57622 100644
--- a/addons/rabbitmq/templates/_helpers.tpl
+++ b/addons/rabbitmq/templates/_helpers.tpl
@@ -51,41 +51,27 @@ app.kubernetes.io/name: {{ include "rabbitmq.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
-
 {{/*
-Return rabbitmq service port
+Common annotations
 */}}
-{{- define "rabbitmq.service.port" -}}
-{{- .Values.primary.service.ports.rabbitmq -}}
-{{- end -}}
+{{- define "rabbitmq.annotations" -}}
+helm.sh/resource-policy: keep              
+{{- end }}
 
 {{/*
-Get the password key.
+Define rabbitmq component definition name prefix
 */}}
-{{- define "rabbitmq.password" -}}
-{{- if or (.Release.IsInstall) (not (lookup "apps.kubeblocks.io/v1alpha1" "ClusterDefinition" "" "rabbitmq")) -}}
-{{ .Values.auth.password | default "$(RANDOM_PASSWD)"}}
-{{- else -}}
-{{ index (lookup "apps.kubeblocks.io/v1alpha1" "ClusterDefinition" "" "rabbitmq").spec.connectionCredential "password"}}
-{{- end }}
-{{- end }}
+{{- define "rabbitmq.cmpdNamePrefix" -}}
+{{- printf "rabbitmq-" -}}
+{{- end -}}
 
 {{/*
-Check if cluster version is enabled, if enabledClusterVersions is empty, return true,
-otherwise, check if the cluster version is in the enabledClusterVersions list, if yes, return true,
-else return false.
-Parameters: cvName, values
+Define rabbitmq component definition name
 */}}
-{{- define "rabbitmq.isClusterVersionEnabled" -}}
-{{- $cvName := .cvName -}}
-{{- $enabledClusterVersions := .values.enabledClusterVersions -}}
-{{- if eq (len $enabledClusterVersions) 0 -}}
-    {{- true -}}
+{{- define "rabbitmq.cmpdName" -}}
+{{- if eq (len .Values.resourceNamePrefix) 0 -}}
+{{ include "rabbitmq.cmpdNamePrefix" . }}{{ .Chart.Version }}
 {{- else -}}
-    {{- range $enabledClusterVersions -}}
-        {{- if eq $cvName . -}}
-            {{- true -}}
-        {{- end -}}
-    {{- end -}}
+{{ .Values.resourceNamePrefix}}-{{ .Chart.Version }}
 {{- end -}}
 {{- end -}}
diff --git a/addons/rabbitmq/templates/clusterdefinition.yaml b/addons/rabbitmq/templates/clusterdefinition.yaml
new file mode 100644
index 000000000..cbedebf90
--- /dev/null
+++ b/addons/rabbitmq/templates/clusterdefinition.yaml
@@ -0,0 +1,13 @@
+apiVersion: apps.kubeblocks.io/v1
+kind: ClusterDefinition
+metadata:
+  name: rabbitmq
+  labels:
+    {{- include "rabbitmq.labels" . | nindent 4 }}
+spec:
+  topologies:
+    - name: clustermode
+      components:
+        - name: rabbitmq
+          compDef: {{ include "rabbitmq.cmpdNamePrefix" . }}
+      default: true
diff --git a/addons/rabbitmq/templates/componentdefinition.yaml b/addons/rabbitmq/templates/componentdefinition.yaml
index 74c9db61e..e72ad04b2 100644
--- a/addons/rabbitmq/templates/componentdefinition.yaml
+++ b/addons/rabbitmq/templates/componentdefinition.yaml
@@ -1,9 +1,11 @@
 apiVersion: apps.kubeblocks.io/v1
 kind: ComponentDefinition
 metadata:
-  name: {{ include "rabbitmq.componentDefName" . }}
+  name: {{ include "rabbitmq.cmpdName" . }}
   labels:
     {{- include "rabbitmq.labels" . | nindent 4 }}
+  annotations:
+    {{- include "rabbitmq.annotations" . | nindent 4 }}
 spec:
   provider: kubeblocks.io
   description: RabbitMQ is a reliable and mature messaging and streaming broker.
@@ -69,7 +71,7 @@ spec:
         - name: RABBITMQ_USE_LONGNAME
           value: "true"
         - name: RABBITMQ_NODENAME
-          value: rabbit@$(KB_POD_NAME).$(K8S_SERVICE_NAME).$(MY_POD_NAMESPACE)
+          value: rabbit@$(MY_POD_NAME).$(K8S_SERVICE_NAME).$(MY_POD_NAMESPACE)
         - name: K8S_HOSTNAME_SUFFIX
           value: .$(K8S_SERVICE_NAME).$(MY_POD_NAMESPACE)
         image: {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}
diff --git a/addons/rabbitmq/templates/componentversion.yaml b/addons/rabbitmq/templates/componentversion.yaml
index fe1f05dc3..9d22e46d3 100644
--- a/addons/rabbitmq/templates/componentversion.yaml
+++ b/addons/rabbitmq/templates/componentversion.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   compatibilityRules:
     - compDefs:
-        - {{ include "rabbitmq.componentDefName" . }}
+        - {{ include "rabbitmq.cmpdNamePrefix" . }}
       releases:
         - 3.13.2
         - 3.12.14
diff --git a/addons/rabbitmq/templates/scriptstemplate.yaml b/addons/rabbitmq/templates/scriptstemplate.yaml
deleted file mode 100644
index db24c80f4..000000000
--- a/addons/rabbitmq/templates/scriptstemplate.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: rabbitmq-scripts
-  labels:
-    {{- include "rabbitmq.labels" . | nindent 4 }}
-data:
-  rabbitmq-setup.sh: |-
-    #!/bin/sh
-    
-    PORT=27018 
-    CONFIG_SVR_NAME=$KB_CLUSTER_NAME"-configsvr"
-    DOMAIN=$CONFIG_SVR_NAME"-headless."$KB_NAMESPACE".svc.cluster.local"