diff --git a/charts/tofu-controller/templates/controller-serviceaccount.yaml b/charts/tofu-controller/templates/controller-serviceaccount.yaml
index f5ce30459..86db89a16 100644
--- a/charts/tofu-controller/templates/controller-serviceaccount.yaml
+++ b/charts/tofu-controller/templates/controller-serviceaccount.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "tofu-controller.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "tofu-controller.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
diff --git a/charts/tofu-controller/templates/deployment.yaml b/charts/tofu-controller/templates/deployment.yaml
index e4f19e746..a82e52b3d 100644
--- a/charts/tofu-controller/templates/deployment.yaml
+++ b/charts/tofu-controller/templates/deployment.yaml
@@ -4,6 +4,8 @@ metadata:
   labels:
     {{- include "tofu-controller.labels" . | nindent 4 }}
   name: {{ include "tofu-controller.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
diff --git a/charts/tofu-controller/templates/metrics-svc.yaml b/charts/tofu-controller/templates/metrics-svc.yaml
index aa3485f39..4ae836be9 100644
--- a/charts/tofu-controller/templates/metrics-svc.yaml
+++ b/charts/tofu-controller/templates/metrics-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "tofu-controller.fullname" . }}-metrics-service
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "tofu-controller.labels" . | nindent 4 }}
 spec:
diff --git a/charts/tofu-controller/templates/packages.yaml b/charts/tofu-controller/templates/packages.yaml
index 0b3610519..c4affc10b 100644
--- a/charts/tofu-controller/templates/packages.yaml
+++ b/charts/tofu-controller/templates/packages.yaml
@@ -3,6 +3,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: OCIRepository
 metadata:
   name: aws-package
+  namespace: {{ .Release.Namespace }}
   annotations:
     metadata.weave.works/description: "This is the AWS package containing primitive modules for flux-iac tofu-controller."
     metadata.weave.works/docs-url: "https://github.com/flux-iac/aws-primitive-modules"
diff --git a/charts/tofu-controller/templates/planner-deployment.yaml b/charts/tofu-controller/templates/planner-deployment.yaml
index 18fc5293e..77059fa42 100644
--- a/charts/tofu-controller/templates/planner-deployment.yaml
+++ b/charts/tofu-controller/templates/planner-deployment.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     {{- include "planner.labels" . | nindent 4 }}
   name: {{ include "planner.fullname" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   # Planner can't be scaled yet.
   replicas: 1