diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 0ffbd0b5..06e9ae61 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -77,11 +77,13 @@ jobs:
         # TODO: rename the secret to avoid confusion
         SMF_CONFIG_MATRIX_ACCESS_TOKEN: ${{ secrets.SMF_BOT_MATRIX_ACCESS_TOKEN }}
         STAKING_MINER_CONFIG_SEED: ${{ secrets.STAKING_MINER_CONFIG_SEED }}
+        SMF_CONFIG_SMF_CONFIG_FAUCET_ACCOUNT_MNEMONIC: ${{ secrets.SMF_CONFIG_FAUCET_ACCOUNT_MNEMONIC }}
       run: |
         shopt -s globstar
         for f in $(find **/ci/*-values.yaml); do
           sed -i "s/__GITHUB_SECRET_SMF_CONFIG_MATRIX_ACCESS_TOKEN/$SMF_CONFIG_MATRIX_ACCESS_TOKEN/g" $f
           sed -i "s/__GITHUB_SECRET_STAKING_MINER_CONFIG_SEED/$STAKING_MINER_CONFIG_SEED/g" $f
+          sed -i "s/__GITHUB_SECRET_SMF_CONFIG_FAUCET_ACCOUNT_MNEMONIC/$SMF_CONFIG_SMF_CONFIG_FAUCET_ACCOUNT_MNEMONIC/g" $f
         done
       if: steps.list-changed.outputs.changed
 
diff --git a/README.md b/README.md
index 2876f208..59adc85f 100644
--- a/README.md
+++ b/README.md
@@ -14,3 +14,4 @@ Parity's [Kubernetes Helm](https://helm.sh/) charts collection.
 - [Substrate faucet](charts/substrate-faucet/README.md): deploy Substrate Faucet service
 - [Substrate telemetry](charts/substrate-telemetry/README.md): deploy the Substrate Telemetry service
 - [Testnet Manager](charts/testnet-manager/README.md): deploy a management tool for operating testnets
+
diff --git a/charts/substrate-faucet/Chart.yaml b/charts/substrate-faucet/Chart.yaml
index adec076b..2c15b16d 100644
--- a/charts/substrate-faucet/Chart.yaml
+++ b/charts/substrate-faucet/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: substrate-faucet
 description: A Helm chart to deploy substrate-faucet
 type: application
-version: 3.0.3
+version: 3.0.4
 maintainers:
   - name: Parity
     url: https://github.com/paritytech/helm-charts
diff --git a/charts/substrate-faucet/README.md b/charts/substrate-faucet/README.md
index 16cd78ad..9848ccb1 100644
--- a/charts/substrate-faucet/README.md
+++ b/charts/substrate-faucet/README.md
@@ -18,7 +18,7 @@ This is intended behaviour. Make sure to run `git add -A` once again to stage ch
 
 # Substrate faucet Helm chart
 
-![Version: 3.0.3](https://img.shields.io/badge/Version-3.0.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 3.0.4](https://img.shields.io/badge/Version-3.0.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 ## Maintainers
 
@@ -206,7 +206,7 @@ Adding default global override for .org.matrix.msc3786.rule.room.server_acl
 | nameOverride | string | `""` | String to partially override common.names.name |
 | nodeSelector | object | `{}` | Node labels for pods assignment ref: https://kubernetes.io/docs/user-guide/node-selection/ |
 | podSecurityContext | object | `{}` | Pods Security Context ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod |
-| postgresql | object | `{"global":{"postgresql":{"auth":{"database":"faucet","postgresPassword":"Secret!"}}},"primary":{"persistence":{"size":"4Gi"},"resources":{"limits":{"memory":"1024Mi"},"requests":{"cpu":"250m","memory":"512Mi"}}}}` | PostgreSQL configuration |
+| postgresql | object | `{"global":{"postgresql":{"auth":{"database":"faucet","postgresPassword":"Secret!"}}},"image":{"repository":"bitnamilegacy/postgresql"},"metrics":{"image":{"repository":"bitnamilegacy/postgresql"}},"primary":{"persistence":{"size":"4Gi"},"resources":{"limits":{"memory":"1024Mi"},"requests":{"cpu":"250m","memory":"512Mi"}}}}` | PostgreSQL configuration |
 | postgresql.global.postgresql.auth | object | `{"database":"faucet","postgresPassword":"Secret!"}` | Auth configuration |
 | postgresql.global.postgresql.auth.database | string | `"faucet"` | Database name |
 | postgresql.global.postgresql.auth.postgresPassword | string | `"Secret!"` | Database password |
diff --git a/charts/substrate-faucet/ci/kind-values.yaml b/charts/substrate-faucet/ci/kind-values.yaml
index 93d165c0..8f382a40 100644
--- a/charts/substrate-faucet/ci/kind-values.yaml
+++ b/charts/substrate-faucet/ci/kind-values.yaml
@@ -5,7 +5,9 @@ faucet:
   secret:
     # your bot access token here is how to find it https://t2bot.io/docs/access_tokens/
     SMF_CONFIG_MATRIX_ACCESS_TOKEN: "__GITHUB_SECRET_SMF_CONFIG_MATRIX_ACCESS_TOKEN"
+    # just generate a random seed with "docker run -it parity/subkey generate"
+    SMF_CONFIG_FAUCET_ACCOUNT_MNEMONIC: "__GITHUB_SECRET_SMF_CONFIG_FAUCET_ACCOUNT_MNEMONIC"
   config:
-    SMF_CONFIG_NETWORK: "rococo"
+    SMF_CONFIG_NETWORK: "westend"
     SMF_CONFIG_MATRIX_SERVER: "https://m.parity.io"
     SMF_CONFIG_MATRIX_BOT_USER_ID: "@helm-charts-bot:parity.io"
diff --git a/charts/substrate-faucet/values.yaml b/charts/substrate-faucet/values.yaml
index d3fe2b7e..896f2bf2 100644
--- a/charts/substrate-faucet/values.yaml
+++ b/charts/substrate-faucet/values.yaml
@@ -89,6 +89,11 @@ ingress:
 
 # -- PostgreSQL configuration
 postgresql:
+  image:
+    repository: bitnamilegacy/postgresql
+  metrics:
+    image:
+      repository: bitnamilegacy/postgresql
   global:
     postgresql:
       # -- Auth configuration