diff --git a/templates/secrets.yaml b/templates/secrets.yaml
index 5047d2a..b18b8d4 100644
--- a/templates/secrets.yaml
+++ b/templates/secrets.yaml
@@ -3,21 +3,23 @@ apiVersion: v1
 kind: Secret
 metadata:
   labels:
-    app.kubernetes.io/name: {{ .Values.nameOverride }}
+    app.kubernetes.io/name: {{ .Chart.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-  name: secret.{{ .Values.database.name }}
+  name: {{ .Values.database.name }}
   namespace: nautobot
 type: Opaque
 data:
-  password: {{ .Values.database.password | b64enc }}
-  username: {{ .Values.database.username | b64enc }}
+  password: {{ .Values.postgresql.database.password | b64enc }}
+  username: {{ .Values.postgresql.database.password | b64enc }}
+  nbPassword: {{ .Values.database.password | b64enc }}
+  nbusername: {{ .Values.database.password | b64enc }}
 ---
 apiVersion: v1
 kind: Secret
 metadata:
   labels:
     app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/name: {{ .Values.nameOverride }}
+    app.kubernetes.io/name: {{ .Chart.Name }}
   name: {{ .Values.superUser.secret.name }}
   namespace: nautobot
 type: Opaque
@@ -32,9 +34,9 @@ apiVersion: v1
 kind: Secret
 metadata:
   labels:
-    app.kubernetes.io/name: {{ .Values.nameOverride }}
+    app.kubernetes.io/name: {{ .Chart.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-  name: secret.github.ghcr
+  name: ghcr
   namespace: nautobot
 data:
     .dockerconfigjson: {{ .Values.image.secret.data }}
@@ -44,9 +46,9 @@ apiVersion: v1
 kind: Secret
 metadata:
   labels:
-    app.kubernetes.io/name: {{ .Values.nameOverride }}
+    app.kubernetes.io/name: {{ .Chart.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
-  name: secret.github.sso
+  name: github-sso
   namespace: nautobot
 type: Opaque
 data:
diff --git a/values.yaml b/values.yaml
index b5b6215..97fce0f 100644
--- a/values.yaml
+++ b/values.yaml
@@ -98,23 +98,10 @@ config:
   name: nautobot-config
   root: /opt/nautobot
 
-###
-# ```{rubric} Database
-# ```
-# ---
-# Configure a relational database connection, MySQL and PostgreSQL are
-# supported.
-#
-# ```{literalinclude} /values.yaml
-# :caption: database
-# :language: yaml
-# :start-at: "database:\n"
-# :end-before: "###\n"
-# ```
 database:
   database: nautobot
   engine: django.db.backends.postgresql
-  host: postgresql.postgresql.svc.cluster.local
+  host: postgresql.nautobot.svc.cluster.local
   name: postgres
   password: ""
   port: '5432'
@@ -308,7 +295,6 @@ podAnnotations: {}
 # ```
 podLabels:
   app: nautobot
-
 ###
 # ```{rubric} Pod Security Context
 # ```
@@ -330,6 +316,69 @@ podLabels:
 # ```
 podSecurityContext: {}
 
+###
+# ```{rubric} PostgreSQL settings
+# ```
+# ---
+# Enable and configure PostgreSQL.
+#
+# ```{literalinclude} /values.yaml
+# :caption: postgresql as a dependency
+# :language: yaml
+# :start-at: "postgresql:\n"
+# :end-before: "###\n"
+# ```
+#
+# ```{code-block} yaml
+# :caption: postgresql chart settings
+#
+# podSecurityContext:
+#  fsGroup: 1000
+# ```
+postgresql:
+  enabled: true
+
+  ###
+  # ```{rubric} Database settings
+  # ```
+  # ---
+  # Configure dependent database.
+  #
+  # ```{literalinclude} /values.yaml
+  # :caption: database
+  # :language: yaml
+  # :start-at: "database:\n"
+  # :end-before: "###\n"
+  # ```
+  database:
+    database: nautobot
+    engine: django.db.backends.postgresql
+    host: postgresql.nautobot.svc.cluster.local
+    name: postgres
+    password: ""
+    port: '5432'
+    secretfile: secrets/values.yaml
+    timeout: '300'
+    username: ""
+
+###
+# ```{rubric} Redis
+# ```
+# ---
+# Enable and configure Redis.
+#
+# ```{literalinclude} /values.yaml
+# :caption: redis
+# :language: yaml
+# :start-at: "redis:\n"
+# :end-before: "###\n"
+# ```
+#
+# ```{code-block} yaml
+# ```
+redis:
+  enabled: true
+
 ###
 # ```{rubric} Replica Count
 # ```