diff --git a/.gitignore b/.gitignore
index 85e7c1d..a654ad1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /.idea/
+apps/*/*/charts/
diff --git a/charts/apps/piped/Chart.yaml b/charts/apps/piped/Chart.yaml
index bb0b852..e009c9c 100644
--- a/charts/apps/piped/Chart.yaml
+++ b/charts/apps/piped/Chart.yaml
@@ -9,7 +9,7 @@ sources:
   - https://github.com/TeamPiped/piped-proxy
 keywords:
   - streaming
-version: 2.0.0
+version: 2.0.1
 appVersion: latest
 kubeVersion: ">=1.22.0-0"
 maintainers:
@@ -26,5 +26,5 @@ dependencies:
     condition: postgresql.enabled
 annotations:
   artifacthub.io/changes: |-
-    - kind: changed
-      description: The backend uses the CMD line from the Dockerfile.
+    - kind: fixed
+      description: The backend configmap generation (GH issue: https://github.com/TeamPiped/Piped-Kubernetes/issues/2)
diff --git a/charts/apps/piped/README.md b/charts/apps/piped/README.md
index 7a45561..c254fe4 100644
--- a/charts/apps/piped/README.md
+++ b/charts/apps/piped/README.md
@@ -1,6 +1,6 @@
 # piped
 
-![Version: 2.0.0](https://img.shields.io/badge/Version-2.0.0-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
+![Version: 2.0.1](https://img.shields.io/badge/Version-2.0.1-informational?style=flat-square) ![AppVersion: latest](https://img.shields.io/badge/AppVersion-latest-informational?style=flat-square)
 
 Piped is an alternative privacy-friendly YouTube frontend which is efficient by design.
 
@@ -160,7 +160,7 @@ helm install piped TeamPiped/piped -f values.yaml
 
 ## Changelog
 
-### Version 2.0.0
+### Version 2.0.1
 
 #### Added
 
@@ -168,11 +168,11 @@ N/A
 
 #### Changed
 
-* The backend uses the CMD line from the Dockerfile.
+N/A
 
 #### Fixed
 
-N/A
+- The backend configmap generation (GH issue: https://github.com/TeamPiped/Piped-Kubernetes/issues/2)
 
 ## Support
 
diff --git a/charts/apps/piped/charts/common-1.3.2.tgz b/charts/apps/piped/charts/common-1.3.2.tgz
new file mode 100644
index 0000000..faf80d5
Binary files /dev/null and b/charts/apps/piped/charts/common-1.3.2.tgz differ
diff --git a/charts/apps/piped/charts/postgresql-12.2.0.tgz b/charts/apps/piped/charts/postgresql-12.2.0.tgz
new file mode 100644
index 0000000..dfab809
Binary files /dev/null and b/charts/apps/piped/charts/postgresql-12.2.0.tgz differ
diff --git a/charts/apps/piped/templates/backend/configmap.yaml b/charts/apps/piped/templates/backend/configmap.yaml
index 2aeff58..895caed 100644
--- a/charts/apps/piped/templates/backend/configmap.yaml
+++ b/charts/apps/piped/templates/backend/configmap.yaml
@@ -54,10 +54,12 @@ data:
     COMPROMISED_PASSWORD_CHECK: {{ .Values.backend.config.COMPROMISED_PASSWORD_CHECK | default true }}
     DISABLE_REGISTRATION: {{ .Values.backend.config.DISABLE_REGISTRATION |  default false }}
     FEED_RETENTION: {{ .Values.backend.config.DISABLE_REGISTRATION | int | default 30 }}
-    {{- if .Values.backend.config.database }}
+    {{- if and (.Values.backend.config.database) (not .Values.postgresql.enabled) }}
     hibernate.connection.url: {{.Values.backend.config.database.connection_url }}
     hibernate.connection.driver_class: {{.Values.backend.config.database.driver_class }}
     hibernate.dialect: {{.Values.backend.config.database.dialect }}
+    hibernate.connection.username: {{.Values.backend.config.database.username }}
+    hibernate.connection.password: {{.Values.backend.config.database.password }}
     {{- if .Values.backend.config.database.secret }}
     hibernate.connection.username: {{ include "common.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" .Values.backend.config.database.secret "Key" "database.username" ) -}}
     hibernate.connection.password: {{ include "common.getValueFromSecret" (dict "Namespace" .Release.Namespace "Name" .Values.backend.config.database.secret "Key" "database.password") -}}
@@ -68,9 +70,6 @@ data:
     hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect
     hibernate.connection.username: {{.Values.postgresql.auth.username }}
     hibernate.connection.password: {{.Values.postgresql.auth.password }}
-    {{- else if not (.Values.postgresql.enabled .Values.backend.config.database.secret) }}
-    hibernate.connection.username: {{.Values.backend.config.database.username }}
-    hibernate.connection.password: {{.Values.backend.config.database.password }}
     {{- else }}
      {{- fail "Unable to figure out database configuration for backend configmap."}}
     {{- end }}