diff --git a/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml b/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml
index fd9b7f4..10ae61b 100644
--- a/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml
+++ b/7project/charts/myapp-chart/templates/rabbitmq-permission.yaml
@@ -3,7 +3,7 @@ apiVersion: rabbitmq.com/v1beta1
 kind: Permission
 metadata:
   name: {{ printf "%s-permission" (.Values.rabbitmq.username | default "demo-app") }}
-  namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/managed-by: Helm
 spec:
diff --git a/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml b/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml
index 0f56cfd..4d2b451 100644
--- a/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml
+++ b/7project/charts/myapp-chart/templates/rabbitmq-queue.yaml
@@ -3,7 +3,7 @@ apiVersion: rabbitmq.com/v1beta1
 kind: Queue
 metadata:
   name: {{ .Values.worker.mailQueueName | replace "_" "-" | lower }}
-  namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/managed-by: Helm
 spec:
diff --git a/7project/charts/myapp-chart/templates/rabbitmq-user-secret.yaml b/7project/charts/myapp-chart/templates/rabbitmq-user-secret.yaml
index 49194e0..6249b5f 100644
--- a/7project/charts/myapp-chart/templates/rabbitmq-user-secret.yaml
+++ b/7project/charts/myapp-chart/templates/rabbitmq-user-secret.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ printf "%s-user-credentials" (.Values.rabbitmq.username | default "app-user") }}
-  namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/managed-by: Helm
 stringData:
diff --git a/7project/charts/myapp-chart/templates/rabbitmq-user.yaml b/7project/charts/myapp-chart/templates/rabbitmq-user.yaml
index b2c1675..e038524 100644
--- a/7project/charts/myapp-chart/templates/rabbitmq-user.yaml
+++ b/7project/charts/myapp-chart/templates/rabbitmq-user.yaml
@@ -3,7 +3,7 @@ apiVersion: rabbitmq.com/v1beta1
 kind: User
 metadata:
   name: {{ .Values.rabbitmq.username | default "demo-app" }}
-  namespace: {{ .Values.rabbitmq.namespace | default "rabbitmq" }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app.kubernetes.io/managed-by: Helm
 spec: