diff --git a/stable/artifactory/templates/admin-bootstrap-creds.yaml b/stable/artifactory/templates/admin-bootstrap-creds.yaml
index eb2d613c6..fd88dab55 100644
--- a/stable/artifactory/templates/admin-bootstrap-creds.yaml
+++ b/stable/artifactory/templates/admin-bootstrap-creds.yaml
@@ -4,6 +4,7 @@ kind: Secret
 apiVersion: v1
 metadata:
   name: {{ template "artifactory.fullname" . }}-bootstrap-creds
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/artifactory-access-config.yaml b/stable/artifactory/templates/artifactory-access-config.yaml
index 4fcf85d94..eb171e2e2 100644
--- a/stable/artifactory/templates/artifactory-access-config.yaml
+++ b/stable/artifactory/templates/artifactory-access-config.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "artifactory.fullname" . }}-access-config
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/artifactory-binarystore-secret.yaml b/stable/artifactory/templates/artifactory-binarystore-secret.yaml
index 6b721dd4c..b8937f3b8 100644
--- a/stable/artifactory/templates/artifactory-binarystore-secret.yaml
+++ b/stable/artifactory/templates/artifactory-binarystore-secret.yaml
@@ -3,6 +3,7 @@ kind: Secret
 apiVersion: v1
 metadata:
   name: {{ template "artifactory.fullname" . }}-binarystore
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/artifactory-configmaps.yaml b/stable/artifactory/templates/artifactory-configmaps.yaml
index 359fa07d2..7cc6a6a58 100644
--- a/stable/artifactory/templates/artifactory-configmaps.yaml
+++ b/stable/artifactory/templates/artifactory-configmaps.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "artifactory.fullname" . }}-configmaps
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.fullname" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
@@ -10,4 +11,4 @@ metadata:
     release: {{ .Release.Name }}
 data:
 {{ tpl .Values.artifactory.configMaps . | indent 2 }}
-{{ end -}}
\ No newline at end of file
+{{ end -}}
diff --git a/stable/artifactory/templates/artifactory-custom-secrets.yaml b/stable/artifactory/templates/artifactory-custom-secrets.yaml
index 4b73e79fc..3ad8e11bd 100644
--- a/stable/artifactory/templates/artifactory-custom-secrets.yaml
+++ b/stable/artifactory/templates/artifactory-custom-secrets.yaml
@@ -5,6 +5,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "artifactory.fullname" $ }}-{{ .name }}
+  namespace: {{ $.Release.Namespace | quote }}
   labels:
     app: "{{ template "artifactory.name" $ }}"
     chart: "{{ template "artifactory.chart" $ }}"
diff --git a/stable/artifactory/templates/artifactory-database-secrets.yaml b/stable/artifactory/templates/artifactory-database-secrets.yaml
index f98d422e9..a4eb3e740 100644
--- a/stable/artifactory/templates/artifactory-database-secrets.yaml
+++ b/stable/artifactory/templates/artifactory-database-secrets.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "artifactory.fullname" . }}-database-creds
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/artifactory-gcp-credentials-secret.yaml b/stable/artifactory/templates/artifactory-gcp-credentials-secret.yaml
index 72dee6bb8..1ea4ad30a 100644
--- a/stable/artifactory/templates/artifactory-gcp-credentials-secret.yaml
+++ b/stable/artifactory/templates/artifactory-gcp-credentials-secret.yaml
@@ -4,6 +4,7 @@ kind: Secret
 apiVersion: v1
 metadata:
   name: {{ template "artifactory.fullname" . }}-gcpcreds
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -13,4 +14,4 @@ stringData:
   gcp.credentials.json: |-
 {{ tpl .Values.artifactory.persistence.googleStorage.gcpServiceAccount.config . | indent 4 }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/artifactory/templates/artifactory-hpa.yaml b/stable/artifactory/templates/artifactory-hpa.yaml
index 41a0f79dc..fe1bd69c1 100644
--- a/stable/artifactory/templates/artifactory-hpa.yaml
+++ b/stable/artifactory/templates/artifactory-hpa.yaml
@@ -12,6 +12,7 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "artifactory.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
diff --git a/stable/artifactory/templates/artifactory-installer-info.yaml b/stable/artifactory/templates/artifactory-installer-info.yaml
index cfb95b67d..f30d1b7fe 100644
--- a/stable/artifactory/templates/artifactory-installer-info.yaml
+++ b/stable/artifactory/templates/artifactory-installer-info.yaml
@@ -2,6 +2,7 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   name: {{ template "artifactory.fullname" . }}-installer-info
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/artifactory-license-secret.yaml b/stable/artifactory/templates/artifactory-license-secret.yaml
index dda734033..5d49ee9fb 100644
--- a/stable/artifactory/templates/artifactory-license-secret.yaml
+++ b/stable/artifactory/templates/artifactory-license-secret.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "artifactory.fullname" $ }}-license
+  namespace: {{ $.Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" $ }}
     chart: {{ template "artifactory.chart" $ }}
@@ -13,4 +14,4 @@ type: Opaque
 data:
   artifactory.lic: {{ . | b64enc | quote }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/artifactory/templates/artifactory-migration-scripts.yaml b/stable/artifactory/templates/artifactory-migration-scripts.yaml
index 4b1ba4027..23fc60873 100644
--- a/stable/artifactory/templates/artifactory-migration-scripts.yaml
+++ b/stable/artifactory/templates/artifactory-migration-scripts.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "artifactory.fullname" . }}-migration-scripts
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -15,4 +16,4 @@ data:
 {{ .Files.Get "files/migrationHelmInfo.yaml" | indent 4 }}
   migrationStatus.sh: |
 {{ .Files.Get "files/migrationStatus.sh" | indent 4 }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/artifactory/templates/artifactory-networkpolicy.yaml b/stable/artifactory/templates/artifactory-networkpolicy.yaml
index d24203dc9..3af57adf6 100644
--- a/stable/artifactory/templates/artifactory-networkpolicy.yaml
+++ b/stable/artifactory/templates/artifactory-networkpolicy.yaml
@@ -3,6 +3,7 @@ apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
   name: {{ template "artifactory.fullname" $ }}-{{ .name }}-networkpolicy
+  namespace: {{ $.Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" $ }}
     chart: {{ template "artifactory.chart" $ }}
@@ -31,4 +32,4 @@ spec:
 {{ .egress | toYaml | trimSuffix "\n" | indent 2 -}}
 {{- end }}
 ---
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/stable/artifactory/templates/artifactory-nfs-pvc.yaml b/stable/artifactory/templates/artifactory-nfs-pvc.yaml
index 75d6d0c53..dab1b0dbc 100644
--- a/stable/artifactory/templates/artifactory-nfs-pvc.yaml
+++ b/stable/artifactory/templates/artifactory-nfs-pvc.yaml
@@ -30,6 +30,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "artifactory.fullname" . }}-data-pvc
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -80,6 +81,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "artifactory.fullname" . }}-backup-pvc
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/artifactory-pdb.yaml b/stable/artifactory/templates/artifactory-pdb.yaml
index 68876d23b..f485d45c3 100644
--- a/stable/artifactory/templates/artifactory-pdb.yaml
+++ b/stable/artifactory/templates/artifactory-pdb.yaml
@@ -7,6 +7,7 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "artifactory.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/artifactory-role.yaml b/stable/artifactory/templates/artifactory-role.yaml
index db01f235f..fb04887d7 100644
--- a/stable/artifactory/templates/artifactory-role.yaml
+++ b/stable/artifactory/templates/artifactory-role.yaml
@@ -9,6 +9,7 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "artifactory.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
 rules:
 {{ toYaml .Values.rbac.role.rules }}
 {{- end }}
diff --git a/stable/artifactory/templates/artifactory-rolebinding.yaml b/stable/artifactory/templates/artifactory-rolebinding.yaml
index dfb42258f..d3fdd49df 100644
--- a/stable/artifactory/templates/artifactory-rolebinding.yaml
+++ b/stable/artifactory/templates/artifactory-rolebinding.yaml
@@ -9,6 +9,7 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "artifactory.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
 subjects:
 - kind: ServiceAccount
   name: {{ template "artifactory.serviceAccountName" . }}
diff --git a/stable/artifactory/templates/artifactory-secrets.yaml b/stable/artifactory/templates/artifactory-secrets.yaml
index 266d8e39a..f615c74b7 100644
--- a/stable/artifactory/templates/artifactory-secrets.yaml
+++ b/stable/artifactory/templates/artifactory-secrets.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "artifactory.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -27,4 +28,4 @@ data:
   {{- end }}
   {{- end }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/artifactory/templates/artifactory-service-grpc.yaml b/stable/artifactory/templates/artifactory-service-grpc.yaml
index b40e94c5f..ffae16e6b 100644
--- a/stable/artifactory/templates/artifactory-service-grpc.yaml
+++ b/stable/artifactory/templates/artifactory-service-grpc.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "artifactory.serviceGrpc.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -41,4 +42,4 @@ spec:
     app: {{ template "artifactory.name" . }}
     component: "{{ .Values.artifactory.name }}"
     release: {{ .Release.Name }}
-{{- end -}}
\ No newline at end of file
+{{- end -}}
diff --git a/stable/artifactory/templates/artifactory-service.yaml b/stable/artifactory/templates/artifactory-service.yaml
index cf2d62b99..b99ba0814 100644
--- a/stable/artifactory/templates/artifactory-service.yaml
+++ b/stable/artifactory/templates/artifactory-service.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "artifactory.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -56,4 +57,4 @@ spec:
   selector:
     app: {{ template "artifactory.name" . }}
     component: "{{ .Values.artifactory.name }}"
-    release: {{ .Release.Name }}
\ No newline at end of file
+    release: {{ .Release.Name }}
diff --git a/stable/artifactory/templates/artifactory-serviceaccount.yaml b/stable/artifactory/templates/artifactory-serviceaccount.yaml
index 03cac128a..9f82ed14e 100644
--- a/stable/artifactory/templates/artifactory-serviceaccount.yaml
+++ b/stable/artifactory/templates/artifactory-serviceaccount.yaml
@@ -13,5 +13,6 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "artifactory.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace | quote }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
 {{- end }}
diff --git a/stable/artifactory/templates/artifactory-statefulset.yaml b/stable/artifactory/templates/artifactory-statefulset.yaml
index 2237c4170..a04ddff72 100644
--- a/stable/artifactory/templates/artifactory-statefulset.yaml
+++ b/stable/artifactory/templates/artifactory-statefulset.yaml
@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: {{ template "artifactory.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -1924,4 +1925,4 @@ spec:
       resources:
         requests:
           storage: {{ .Values.artifactory.customPersistentVolumeClaim.size }}
-  {{- end }}
\ No newline at end of file
+  {{- end }}
diff --git a/stable/artifactory/templates/artifactory-system-yaml.yaml b/stable/artifactory/templates/artifactory-system-yaml.yaml
index 80974274d..a75a70c74 100644
--- a/stable/artifactory/templates/artifactory-system-yaml.yaml
+++ b/stable/artifactory/templates/artifactory-system-yaml.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "artifactory.fullname" . }}-systemyaml
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/artifactory-unified-secret.yaml b/stable/artifactory/templates/artifactory-unified-secret.yaml
index bb6719b4e..4d905ff7a 100644
--- a/stable/artifactory/templates/artifactory-unified-secret.yaml
+++ b/stable/artifactory/templates/artifactory-unified-secret.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret
+  namespace: {{ $.Release.Namespace | quote }}
   labels:
     app: "{{ template "artifactory.name" $ }}"
     chart: "{{ template "artifactory.chart" $ }}"
diff --git a/stable/artifactory/templates/filebeat-configmap.yaml b/stable/artifactory/templates/filebeat-configmap.yaml
index 382ad3df6..a091c7c5d 100644
--- a/stable/artifactory/templates/filebeat-configmap.yaml
+++ b/stable/artifactory/templates/filebeat-configmap.yaml
@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "artifactory.fullname" . }}-filebeat-config
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
diff --git a/stable/artifactory/templates/ingress-grpc.yaml b/stable/artifactory/templates/ingress-grpc.yaml
index bb0995fc2..8e087eade 100644
--- a/stable/artifactory/templates/ingress-grpc.yaml
+++ b/stable/artifactory/templates/ingress-grpc.yaml
@@ -12,6 +12,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $ingressName }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/ingress.yaml b/stable/artifactory/templates/ingress.yaml
index 7a3669161..d139a6fe6 100644
--- a/stable/artifactory/templates/ingress.yaml
+++ b/stable/artifactory/templates/ingress.yaml
@@ -14,6 +14,7 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: {{ $ingressName }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/logger-configmap.yaml b/stable/artifactory/templates/logger-configmap.yaml
index 41a078b02..5b36e60e2 100644
--- a/stable/artifactory/templates/logger-configmap.yaml
+++ b/stable/artifactory/templates/logger-configmap.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "artifactory.fullname" . }}-logger
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/nginx-artifactory-conf.yaml b/stable/artifactory/templates/nginx-artifactory-conf.yaml
index 343448994..08ce6330d 100644
--- a/stable/artifactory/templates/nginx-artifactory-conf.yaml
+++ b/stable/artifactory/templates/nginx-artifactory-conf.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "artifactory.fullname" . }}-nginx-artifactory-conf
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -15,4 +16,4 @@ data:
 {{- else }}
 {{ tpl ( .Files.Get "files/nginx-artifactory-conf.yaml" ) . | indent 4 }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/artifactory/templates/nginx-certificate-secret.yaml b/stable/artifactory/templates/nginx-certificate-secret.yaml
index f13d40174..37e18a732 100644
--- a/stable/artifactory/templates/nginx-certificate-secret.yaml
+++ b/stable/artifactory/templates/nginx-certificate-secret.yaml
@@ -4,6 +4,7 @@ kind: Secret
 type: kubernetes.io/tls
 metadata:
   name: {{ template "artifactory.fullname" . }}-nginx-certificate
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/nginx-conf.yaml b/stable/artifactory/templates/nginx-conf.yaml
index 31219d58a..75d107f79 100644
--- a/stable/artifactory/templates/nginx-conf.yaml
+++ b/stable/artifactory/templates/nginx-conf.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "artifactory.fullname" . }}-nginx-conf
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -15,4 +16,4 @@ data:
 {{- else }}
 {{ tpl ( .Files.Get "files/nginx-main-conf.yaml" ) . | indent 4 }}
 {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/artifactory/templates/nginx-deployment.yaml b/stable/artifactory/templates/nginx-deployment.yaml
index 774bedcca..bf53332e9 100644
--- a/stable/artifactory/templates/nginx-deployment.yaml
+++ b/stable/artifactory/templates/nginx-deployment.yaml
@@ -5,6 +5,7 @@ apiVersion: apps/v1
 kind: {{ .Values.nginx.kind }}
 metadata:
   name: {{ template "artifactory.nginx.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -220,4 +221,4 @@ spec:
           secretName: {{ template "artifactory.fullname" . }}-nginx-certificate
       {{- end }}
       {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/artifactory/templates/nginx-pdb.yaml b/stable/artifactory/templates/nginx-pdb.yaml
index dff0c23a3..ba4aa0eea 100644
--- a/stable/artifactory/templates/nginx-pdb.yaml
+++ b/stable/artifactory/templates/nginx-pdb.yaml
@@ -7,6 +7,7 @@ apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "artifactory.nginx.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/nginx-pvc.yaml b/stable/artifactory/templates/nginx-pvc.yaml
index 3394a0ade..37ca0e059 100644
--- a/stable/artifactory/templates/nginx-pvc.yaml
+++ b/stable/artifactory/templates/nginx-pvc.yaml
@@ -4,6 +4,7 @@ kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: {{ template "artifactory.nginx.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/nginx-scripts-conf.yaml b/stable/artifactory/templates/nginx-scripts-conf.yaml
index a69952785..3555cf8e1 100644
--- a/stable/artifactory/templates/nginx-scripts-conf.yaml
+++ b/stable/artifactory/templates/nginx-scripts-conf.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "artifactory.fullname" . }}-nginx-scripts
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
diff --git a/stable/artifactory/templates/nginx-service.yaml b/stable/artifactory/templates/nginx-service.yaml
index 29fb9132d..0682763c2 100644
--- a/stable/artifactory/templates/nginx-service.yaml
+++ b/stable/artifactory/templates/nginx-service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "artifactory.nginx.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -85,4 +86,4 @@ spec:
     app: {{ template "artifactory.name" . }}
     component: {{ .Values.nginx.name }}
     release: {{ .Release.Name }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/artifactory/templates/rtfs-deployment.yaml b/stable/artifactory/templates/rtfs-deployment.yaml
index 25b03d853..46e909cde 100644
--- a/stable/artifactory/templates/rtfs-deployment.yaml
+++ b/stable/artifactory/templates/rtfs-deployment.yaml
@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "rtfs.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -347,4 +348,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/artifactory/templates/rtfs-hpa.yaml b/stable/artifactory/templates/rtfs-hpa.yaml
index fd8b0bcc8..f066268a1 100644
--- a/stable/artifactory/templates/rtfs-hpa.yaml
+++ b/stable/artifactory/templates/rtfs-hpa.yaml
@@ -12,6 +12,7 @@ metadata:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
   name: {{ template "rtfs.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
@@ -29,4 +30,4 @@ spec:
       {{- if .Values.rtfs.autoscaling.metrics }}
 {{ tpl (include "rtfs.metrics" .) . | indent 4 }}
       {{- end }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/stable/artifactory/templates/rtfs-service.yaml b/stable/artifactory/templates/rtfs-service.yaml
index 3d16053a6..53f7e5a59 100644
--- a/stable/artifactory/templates/rtfs-service.yaml
+++ b/stable/artifactory/templates/rtfs-service.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "rtfs.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
   labels:
     app: {{ template "artifactory.name" . }}
     chart: {{ template "artifactory.chart" . }}
@@ -39,4 +40,4 @@ spec:
     app: {{ template "artifactory.name" . }}
     release: {{ .Release.Name }}
     component: {{ .Values.rtfs.name }}
-{{- end }}
\ No newline at end of file
+{{- end }}