diff --git a/charts/postgres-operator/postgres-operator-1.7.0.tgz b/charts/postgres-operator/postgres-operator-1.7.0.tgz
index 49200267d..2a8bc745e 100644
Binary files a/charts/postgres-operator/postgres-operator-1.7.0.tgz and b/charts/postgres-operator/postgres-operator-1.7.0.tgz differ
diff --git a/charts/postgres-operator/templates/_helpers.tpl b/charts/postgres-operator/templates/_helpers.tpl
index c958a99a6..ee3a8dd22 100644
--- a/charts/postgres-operator/templates/_helpers.tpl
+++ b/charts/postgres-operator/templates/_helpers.tpl
@@ -57,18 +57,16 @@ Flatten nested config options when ConfigMap is used as ConfigTarget
 */}}
 {{- define "flattenValuesForConfigMap" }}
 {{- range $key, $value := . }}
-    {{- if or (kindIs "string" $value) (kindIs "int" $value) }}
-{{ $key }}: {{ $value | quote }}
-    {{- end }}
     {{- if kindIs "slice" $value }}
 {{ $key }}: {{ join "," $value | quote }}
-    {{- end }}
-    {{- if kindIs "map" $value }}
+    {{- else if kindIs "map" $value }}
         {{- $list := list }}
         {{- range $subKey, $subValue := $value }}
             {{- $list = append $list (printf "%s:%s" $subKey $subValue) }}
 {{ $key }}: {{ join "," $list | quote }}
         {{- end }}
+    {{- else }}
+{{ $key }}: {{ $value | quote }}
     {{- end }}
 {{- end }}
 {{- end }}
diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml
index f7f8bd2e0..1d938ca63 100644
--- a/manifests/complete-postgres-manifest.yaml
+++ b/manifests/complete-postgres-manifest.yaml
@@ -157,7 +157,7 @@ spec:
 #   - name: "telegraf-sidecar"
 #     image: "telegraf:latest"
 #     ports:
-#       name: metrics
+#     - name: metrics
 #       containerPort: 8094
 #       protocol: TCP
 #     resources:
diff --git a/pkg/util/httpclient/httpclient.go b/pkg/util/httpclient/httpclient.go
index e7022f1a3..706f8c5aa 100644
--- a/pkg/util/httpclient/httpclient.go
+++ b/pkg/util/httpclient/httpclient.go
@@ -1,6 +1,6 @@
 package httpclient
 
-//go:generate mockgen -package mocks -destination=$PWD/mocks/$GOFILE -source=$GOFILE -build_flags=-mod=vendor
+//go:generate mockgen -package mocks -destination=../../../mocks/$GOFILE -source=$GOFILE -build_flags=-mod=vendor
 
 import "net/http"
 
diff --git a/pkg/util/volumes/volumes.go b/pkg/util/volumes/volumes.go
index 556729dc4..5ff923920 100644
--- a/pkg/util/volumes/volumes.go
+++ b/pkg/util/volumes/volumes.go
@@ -1,6 +1,6 @@
 package volumes
 
-//go:generate mockgen -package mocks -destination=$PWD/mocks/$GOFILE -source=$GOFILE -build_flags=-mod=vendor
+//go:generate mockgen -package mocks -destination=../../../mocks/$GOFILE -source=$GOFILE -build_flags=-mod=vendor
 
 import v1 "k8s.io/api/core/v1"