diff --git a/.github/workflows/helm_lint.yaml b/.github/workflows/helm_lint.yaml
index 4a6acd94..13d0ae14 100644
--- a/.github/workflows/helm_lint.yaml
+++ b/.github/workflows/helm_lint.yaml
@@ -5,7 +5,48 @@ on: pull_request
 permissions: read-all
 
 jobs:
-  lint-test:
+  yamllint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+
+      - name: Install yamllint
+        run: |
+          python -m pip install --upgrade pip
+          pip install yamllint
+
+      - name: Run yamllint
+        run: |
+          yamllint -d "{extends: default, rules: {line-length: {level: warning}, braces: {level: warning}, key-duplicates: {level: error}, trailing-spaces: {level: error}}}" infra/helm/meshdb/
+
+  kubeconform:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Helm
+        uses: azure/setup-helm@20d2b4f98d41febe2bbca46408499dbb535b6258 # v3
+        with:
+          version: v3.14.0
+
+      - name: Install Kubeconform Helm plguin
+        run: "helm plugin install https://github.com/jtyr/kubeconform-helm"
+
+      - name: Run Kubeconform Helm
+        run: "helm kubeconform --namespace meshdb infra/helm/meshdb"
+
+  chart-testing:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
diff --git a/infra/helm/meshdb/templates/postgres.yaml b/infra/helm/meshdb/templates/postgres.yaml
index 33510202..f6536610 100644
--- a/infra/helm/meshdb/templates/postgres.yaml
+++ b/infra/helm/meshdb/templates/postgres.yaml
@@ -67,7 +67,7 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: meshdb-secrets
-                  key: postgres-password
+                  key: POSTGRES_PASSWORD
             - name: PGDATA
               value: "/var/lib/postgresql/data/meshdb_data"
           volumeMounts: