diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c2c8d03..b8d89a7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,6 +15,10 @@ on:
         description: "The Trustify container image"
         default: "ghcr.io/trustification/trustd:latest"
         required: true
+      image-db:
+        description: "The Database container image"
+        default: "quay.io/sclorg/postgresql-15-c9s:latest"
+        required: true
 
 jobs:
   prepare:
@@ -34,8 +38,10 @@ jobs:
           
           # Prepare application.yaml
           yq e -P -i '.related.image.server=strenv(IMAGE_SERVER)' src/main/resources/application.yaml
+          yq e -P -i '.related.image.db=strenv(IMAGE_DB)' src/main/resources/application.yaml
         env:
-          IMAGE_SERVER: ghcr.io/trustification/trustd:${{ github.event.inputs.image-server }}
+          IMAGE_SERVER: ${{ github.event.inputs.image-server }}
+          IMAGE_DB: ${{ github.event.inputs.image-db }}
       - name: Set release version ${{ github.event.inputs.version }}
         run: |
           mvn -B versions:set versions:commit -DnewVersion=$NEW_VERSION
@@ -76,6 +82,15 @@ jobs:
         with:
           name: jreleaser-log
           path: 'jreleaser-log.tgz'
+      - name: Restore application.yaml
+        run: |
+          # Install yq
+          RUN curl --output /usr/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
+          chmod +x /usr/bin/yq
+
+          # Prepare application.yaml
+          yq e -P -i '.related.image.server="${RELATED_IMAGE_SERVER:ghcr.io/trustification/trustd:latest}"' src/main/resources/application.yaml
+          yq e -P -i '.related.image.db="${RELATED_IMAGE_DB:quay.io/sclorg/postgresql-15-c9s:latest}"' src/main/resources/application.yaml
       - name: Set version ${{ github.event.inputs.next }}
         run: |
           mvn -B versions:set versions:commit -DnewVersion=$NEW_VERSION
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index edcbbfa..12cb205 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -4,7 +4,6 @@ related:
     server: ${RELATED_IMAGE_SERVER:ghcr.io/trustification/trustd:latest}
     db: ${RELATED_IMAGE_DB:quay.io/sclorg/postgresql-15-c9s:latest}
     pull-policy: Always
-
 # Quarkus config
 quarkus:
   container-image: