diff --git a/charts/atlantis/templates/cluster.yaml b/charts/atlantis/templates/cluster.yaml
index a55b3bff..4e6a9268 100644
--- a/charts/atlantis/templates/cluster.yaml
+++ b/charts/atlantis/templates/cluster.yaml
@@ -56,8 +56,8 @@ spec:
         - ALTER USER app WITH SUPERUSER;
 {{- end }}
 {{- end }}
+{{- if and .Values.cluster.backup.enabled .Values.cluster.enabled -}}
 ---
-{{- if .Values.cluster.backup.enabled -}}
 apiVersion: barmancloud.cnpg.io/v1
 kind: ObjectStore
 metadata:
@@ -67,7 +67,6 @@ spec:
   retentionPolicy: {{ .Values.cluster.backup.backupRetention | default "60d" }}
   configuration:
     destinationPath: {{ .Values.cluster.destinationPath | default ""}}
-    serverName: {{ include "Atlantis.fullname" . }}-db
     endpointURL: http://10.255.241.30:30080
     s3Credentials:
       accessKeyId:
@@ -78,13 +77,12 @@ spec:
         key: access_secret
     wal:
       compression: snappy
-{{- end}}
 ---
-{{- if and .Values.cluster.backup.enabled .Values.cluster.enabled -}}
 apiVersion: postgresql.cnpg.io/v1
 kind: ScheduledBackup
 metadata:
   name: {{ include "Atlantis.fullname" . }}-db
+  namespace: {{ .Release.Namespace }}
 spec:
   schedule: "0 0 1 * * *"
   backupOwnerReference: self
@@ -98,7 +96,8 @@ spec:
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
- name: {{ include "Atlantis.fullname" . }}-db-monitor
+  name: {{ include "Atlantis.fullname" . }}-db-monitor
+  namespace: {{ .Release.Namespace }}
 spec:
   selector:
     matchLabels: