diff --git a/charts/postgres-operator/templates/clusterrole.yaml b/charts/postgres-operator/templates/clusterrole.yaml
index b10523542..a00ea3ab7 100644
--- a/charts/postgres-operator/templates/clusterrole.yaml
+++ b/charts/postgres-operator/templates/clusterrole.yaml
@@ -43,7 +43,7 @@ rules:
   - get
   - list
   - patch
-  - watch # needed if zalando-postgres-operator account is used for pods as well
+  - watch  # needed if zalando-postgres-operator account is used for pods as well
 - apiGroups:
   - ""
   resources:
@@ -76,7 +76,7 @@ rules:
   verbs:
   - get
   - list
-  - update # only for resizing AWS volumes
+  - update  # only for resizing AWS volumes
 - apiGroups:
   - ""
   resources:
@@ -145,7 +145,7 @@ rules:
 - apiGroups:
   - batch
   resources:
-  - cronjobs # enables logical backups
+  - cronjobs  # enables logical backups
   verbs:
   - create
   - delete
diff --git a/charts/postgres-operator/values-crd.yaml b/charts/postgres-operator/values-crd.yaml
index 56e82650b..1ecd8915b 100644
--- a/charts/postgres-operator/values-crd.yaml
+++ b/charts/postgres-operator/values-crd.yaml
@@ -1,7 +1,7 @@
 image:
   registry: registry.opensource.zalan.do
   repository: acid/postgres-operator
-  tag: v1.1.0-54-g3a914f9
+  tag: v1.2.0
   pullPolicy: "IfNotPresent"
 
 # Optionally specify an array of imagePullSecrets.
@@ -98,7 +98,7 @@ configKubernetes:
   # whether the Spilo container should run in privileged mode
   spilo_privileged: false
   # operator watches for postgres objects in the given namespace
-  watched_namespace: "*" # listen to all namespaces
+  watched_namespace: "*"  # listen to all namespaces
 
 # configure resource requests for the Postgres pods
 configPostgresPodResources:
diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml
index 0535d8e28..b7ec6b21f 100644
--- a/charts/postgres-operator/values.yaml
+++ b/charts/postgres-operator/values.yaml
@@ -1,7 +1,7 @@
 image:
   registry: registry.opensource.zalan.do
   repository: acid/postgres-operator
-  tag: v1.1.0-54-g3a914f9
+  tag: v1.2.0
   pullPolicy: "IfNotPresent"
 
 # Optionally specify an array of imagePullSecrets.
@@ -94,7 +94,7 @@ configKubernetes:
   # whether the Spilo container should run in privileged mode
   spilo_privileged: "false"
   # operator watches for postgres objects in the given namespace
-  watched_namespace: "*" # listen to all namespaces
+  watched_namespace: "*"  # listen to all namespaces
 
 # configure resource requests for the Postgres pods
 configPostgresPodResources:
diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml
index ad6b2e9ab..e4a4acf73 100644
--- a/manifests/complete-postgres-manifest.yaml
+++ b/manifests/complete-postgres-manifest.yaml
@@ -13,13 +13,13 @@ spec:
     size: 1Gi
 #   storageClass: my-sc
   numberOfInstances: 2
-  users: # Application/Robot users
+  users:  # Application/Robot users
     zalando:
     - superuser
     - createdb
   enableMasterLoadBalancer: true
   enableReplicaLoadBalancer: true
-  allowedSourceRanges: # load balancers' source ranges for both master and replica services
+  allowedSourceRanges:  # load balancers' source ranges for both master and replica services
   - 127.0.0.1/32
   databases:
     foo: zalando
@@ -66,14 +66,14 @@ spec:
 # clone:
 #   uid: "efd12e58-5786-11e8-b5a7-06148230260c"
 #   cluster: "acid-batman"
-#   timestamp: "2017-12-19T12:40:33+01:00" # timezone required (offset relative to UTC, see RFC 3339 section 5.6)
+#   timestamp: "2017-12-19T12:40:33+01:00"  # timezone required (offset relative to UTC, see RFC 3339 section 5.6)
 #   s3_wal_path: "s3://custom/path/to/bucket"
 
 # run periodic backups with k8s cron jobs
 # enableLogicalBackup: true
 # logicalBackupSchedule: "30 00 * * *"
   maintenanceWindows:
-  - 01:00-06:00 #UTC
+  - 01:00-06:00  #UTC
   - Sat:00:00-04:00
 # sidecars:
 #   - name: "telegraf-sidecar"
diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml
index 00b9fe518..6e92c7225 100644
--- a/manifests/configmap.yaml
+++ b/manifests/configmap.yaml
@@ -76,5 +76,5 @@ data:
   # teams_api_url: http://fake-teams-api.default.svc.cluster.local
   # toleration: ""
   # wal_s3_bucket: ""
-  watched_namespace: "*" # listen to all namespaces
+  watched_namespace: "*"  # listen to all namespaces
   workers: "4"
diff --git a/manifests/minimal-postgres-manifest.yaml b/manifests/minimal-postgres-manifest.yaml
index de90926dd..e94314841 100644
--- a/manifests/minimal-postgres-manifest.yaml
+++ b/manifests/minimal-postgres-manifest.yaml
@@ -9,11 +9,11 @@ spec:
     size: 1Gi
   numberOfInstances: 2
   users:
-    zalando: # database owner
+    zalando:  # database owner
     - superuser
     - createdb
-    foo_user: [] # role for application foo
+    foo_user: []  # role for application foo
   databases:
-    foo: zalando # dbname: owner
+    foo: zalando  # dbname: owner
   postgresql:
     version: "10"
diff --git a/manifests/operator-service-account-rbac.yaml b/manifests/operator-service-account-rbac.yaml
index 95221f204..bca1128f4 100644
--- a/manifests/operator-service-account-rbac.yaml
+++ b/manifests/operator-service-account-rbac.yaml
@@ -44,7 +44,7 @@ rules:
   - get
   - list
   - patch
-  - watch # needed if zalando-postgres-operator account is used for pods as well
+  - watch  # needed if zalando-postgres-operator account is used for pods as well
 - apiGroups:
   - ""
   resources:
@@ -77,7 +77,7 @@ rules:
   verbs:
   - get
   - list
-  - update # only for resizing AWS volumes
+  - update  # only for resizing AWS volumes
 - apiGroups:
   - ""
   resources:
@@ -146,7 +146,7 @@ rules:
 - apiGroups:
   - batch
   resources:
-  - cronjobs # enables logical backups
+  - cronjobs  # enables logical backups
   verbs:
   - create
   - delete
diff --git a/manifests/postgres-operator.yaml b/manifests/postgres-operator.yaml
index f6b73561d..7b74b80a0 100644
--- a/manifests/postgres-operator.yaml
+++ b/manifests/postgres-operator.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: zalando-postgres-operator
       containers:
       - name: postgres-operator
-        image: registry.opensource.zalan.do/acid/smoke-tested-postgres-operator:v1.0.0-37-g2422d72
+        image: registry.opensource.zalan.do/acid/postgres-operator:v1.2.0
         imagePullPolicy: IfNotPresent
         resources:
           requests:
diff --git a/manifests/standby-manifest.yaml b/manifests/standby-manifest.yaml
index c5b999a62..49f2b1a1f 100644
--- a/manifests/standby-manifest.yaml
+++ b/manifests/standby-manifest.yaml
@@ -1,4 +1,3 @@
-
 apiVersion: "acid.zalan.do/v1"
 kind: postgresql
 metadata:
@@ -16,5 +15,5 @@ spec:
     s3_wal_path: "s3://path/to/bucket/containing/wal/of/source/cluster/"
 
   maintenanceWindows:
-  - 01:00-06:00 #UTC
+  - 01:00-06:00  #UTC
   - Sat:00:00-04:00