diff --git a/charts/qdrant/templates/configmap.yaml b/charts/qdrant/templates/configmap.yaml
index ea061b0..4824c1e 100644
--- a/charts/qdrant/templates/configmap.yaml
+++ b/charts/qdrant/templates/configmap.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "qdrant.fullname" . }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
     {{- include "qdrant.additionalLabels" . | nindent 4 }}
diff --git a/charts/qdrant/templates/ingress.yaml b/charts/qdrant/templates/ingress.yaml
index 6ab2798..4f80481 100644
--- a/charts/qdrant/templates/ingress.yaml
+++ b/charts/qdrant/templates/ingress.yaml
@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "qdrant.fullname" . }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
     {{- include "qdrant.additionalLabels" . | nindent 4 }}
diff --git a/charts/qdrant/templates/pdb.yaml b/charts/qdrant/templates/pdb.yaml
index 9904f18..40044fb 100644
--- a/charts/qdrant/templates/pdb.yaml
+++ b/charts/qdrant/templates/pdb.yaml
@@ -3,6 +3,7 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "qdrant.fullname" . }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
     {{- include "qdrant.additionalLabels" . | nindent 4 }}
diff --git a/charts/qdrant/templates/secret.yaml b/charts/qdrant/templates/secret.yaml
index d95db52..0613596 100644
--- a/charts/qdrant/templates/secret.yaml
+++ b/charts/qdrant/templates/secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "qdrant.fullname" . }}-apikey
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
     {{- include "qdrant.additionalLabels" . | nindent 4 }}
diff --git a/charts/qdrant/templates/service-headless.yaml b/charts/qdrant/templates/service-headless.yaml
index 642b1c2..55716e1 100644
--- a/charts/qdrant/templates/service-headless.yaml
+++ b/charts/qdrant/templates/service-headless.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "qdrant.fullname" . }}-headless
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
     {{- include "qdrant.additionalLabels" . | nindent 4 }}
diff --git a/charts/qdrant/templates/service.yaml b/charts/qdrant/templates/service.yaml
index b16e065..f7746ab 100644
--- a/charts/qdrant/templates/service.yaml
+++ b/charts/qdrant/templates/service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "qdrant.fullname" . }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
     {{- include "qdrant.additionalLabels" . | nindent 4 }}
diff --git a/charts/qdrant/templates/serviceaccount.yaml b/charts/qdrant/templates/serviceaccount.yaml
index b3b5ddf..251c6bd 100644
--- a/charts/qdrant/templates/serviceaccount.yaml
+++ b/charts/qdrant/templates/serviceaccount.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "qdrant.fullname" . }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- if or .Values.serviceAccount.annotations .Values.additionalAnnotations }}
   annotations:
 {{- with .Values.additionalAnnotations }}
diff --git a/charts/qdrant/templates/servicemonitor.yaml b/charts/qdrant/templates/servicemonitor.yaml
index 45af6b0..38b5ebf 100644
--- a/charts/qdrant/templates/servicemonitor.yaml
+++ b/charts/qdrant/templates/servicemonitor.yaml
@@ -9,6 +9,7 @@ metadata:
 {{- toYaml . | nindent 4 }}
 {{- end }}
   name: {{ include "qdrant.fullname" . }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
 {{- with .Values.additionalAnnotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/charts/qdrant/templates/statefulset.yaml b/charts/qdrant/templates/statefulset.yaml
index 979ad12..a453b0d 100644
--- a/charts/qdrant/templates/statefulset.yaml
+++ b/charts/qdrant/templates/statefulset.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ include "qdrant.fullname" . }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
     {{- include "qdrant.additionalLabels" . | nindent 4 }}
diff --git a/charts/qdrant/templates/tests/test-db-interaction.yaml b/charts/qdrant/templates/tests/test-db-interaction.yaml
index 3b75408..049832b 100644
--- a/charts/qdrant/templates/tests/test-db-interaction.yaml
+++ b/charts/qdrant/templates/tests/test-db-interaction.yaml
@@ -1,9 +1,10 @@
 {{- $root := . }}
-{{- $namespace := .Release.Namespace }}
+{{- $namespace := .Values.namespace | default .Release.Namespace }}
 apiVersion: v1
 kind: Pod
 metadata:
   name: "{{ include "qdrant.fullname" . }}-test-db-interaction"
+  namespace: {{ $namespace }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
     {{- include "qdrant.additionalLabels" . | nindent 4 }}
@@ -51,6 +52,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: "{{ include "qdrant.fullname" . }}-test-db-interaction"
+  namespace: {{ $namespace }}
   labels:
     {{- include "qdrant.labels" . | nindent 4 }}
     {{- include "qdrant.additionalLabels" . | nindent 4 }}
diff --git a/charts/qdrant/values.yaml b/charts/qdrant/values.yaml
index 56e855d..1282366 100644
--- a/charts/qdrant/values.yaml
+++ b/charts/qdrant/values.yaml
@@ -7,6 +7,7 @@ image:
   useUnprivilegedImage: false
 
 imagePullSecrets: []
+namespace: ""  
 nameOverride: ""
 fullnameOverride: ""
 args: ["./config/initialize.sh"]