diff --git a/.github/workflows/PKICertImport-test.yml b/.github/workflows/PKICertImport-test.yml
index 6c6c304eba1..26f66f4808d 100644
--- a/.github/workflows/PKICertImport-test.yml
+++ b/.github/workflows/PKICertImport-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
diff --git a/.github/workflows/acme-certbot-test.yml b/.github/workflows/acme-certbot-test.yml
index 8814a9a0bb2..daad2f0aba1 100644
--- a/.github/workflows/acme-certbot-test.yml
+++ b/.github/workflows/acme-certbot-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/acme/Installing_PKI_ACME_Responder.md
@@ -35,7 +38,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/acme-container-test.yml b/.github/workflows/acme-container-test.yml
index 70cc2167450..ffc34321701 100644
--- a/.github/workflows/acme-container-test.yml
+++ b/.github/workflows/acme-container-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/podman/Deploying_PKI_ACME_Responder_on_Podman.md
diff --git a/.github/workflows/acme-switchover-test.yml b/.github/workflows/acme-switchover-test.yml
index 11390512e54..d41e2b70c81 100644
--- a/.github/workflows/acme-switchover-test.yml
+++ b/.github/workflows/acme-switchover-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # This test verifies that in a cluster the baseURL parameter can be used
@@ -35,7 +38,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/acme-tests.yml b/.github/workflows/acme-tests.yml
index 0d4ec55d495..77d946003bf 100644
--- a/.github/workflows/acme-tests.yml
+++ b/.github/workflows/acme-tests.yml
@@ -97,6 +97,7 @@ jobs:
     uses: ./.github/workflows/acme-certbot-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   acme-switchover-test:
     name: ACME server switchover
@@ -106,6 +107,7 @@ jobs:
     uses: ./.github/workflows/acme-switchover-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   acme-container-test:
     name: ACME container
@@ -115,3 +117,4 @@ jobs:
     uses: ./.github/workflows/acme-container-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
diff --git a/.github/workflows/ca-basic-test.yml b/.github/workflows/ca-basic-test.yml
index 1e198331133..0cf7d6abb98 100644
--- a/.github/workflows/ca-basic-test.yml
+++ b/.github/workflows/ca-basic-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing_CA.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-clone-secure-ds-test.yml b/.github/workflows/ca-clone-secure-ds-test.yml
index 62b7c08de92..a1d34f3aadf 100644
--- a/.github/workflows/ca-clone-secure-ds-test.yml
+++ b/.github/workflows/ca-clone-secure-ds-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing_CA_Clone.md
@@ -35,7 +38,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh primaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: primaryds.example.com
           PASSWORD: Secret.123
 
@@ -146,7 +149,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh secondaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: secondaryds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-clone-test.yml b/.github/workflows/ca-clone-test.yml
index 982ca36b284..9e257dc118b 100644
--- a/.github/workflows/ca-clone-test.yml
+++ b/.github/workflows/ca-clone-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing_CA.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh primaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: primaryds.example.com
           PASSWORD: Secret.123
 
@@ -81,7 +84,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh secondaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: secondaryds.example.com
           PASSWORD: Secret.123
 
@@ -131,7 +134,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh tertiaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: tertiaryds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-container-test.yml b/.github/workflows/ca-container-test.yml
index 909adee390a..36b8a4e348a 100644
--- a/.github/workflows/ca-container-test.yml
+++ b/.github/workflows/ca-container-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/Deploying-CA-Container
@@ -200,7 +203,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-crl-test.yml b/.github/workflows/ca-crl-test.yml
index c5a80647f44..3da1554402e 100644
--- a/.github/workflows/ca-crl-test.yml
+++ b/.github/workflows/ca-crl-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/CA-CRL-Database
@@ -38,7 +41,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-ds-connection-test.yml b/.github/workflows/ca-ds-connection-test.yml
index b0f7de8a747..dd8ad15906a 100644
--- a/.github/workflows/ca-ds-connection-test.yml
+++ b/.github/workflows/ca-ds-connection-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing_CA.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-ecc-test.yml b/.github/workflows/ca-ecc-test.yml
index 92871b7993c..5b93c08a9d6 100644
--- a/.github/workflows/ca-ecc-test.yml
+++ b/.github/workflows/ca-ecc-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing_CA_with_ECC.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-existing-certs-test.yml b/.github/workflows/ca-existing-certs-test.yml
index e07408c0d4d..12c7d3ab5ad 100644
--- a/.github/workflows/ca-existing-certs-test.yml
+++ b/.github/workflows/ca-existing-certs-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing_CA_with_Existing_Keys_in_Internal_Token.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-existing-ds-test.yml b/.github/workflows/ca-existing-ds-test.yml
index 76ba4a4881a..ae14d22cbf7 100644
--- a/.github/workflows/ca-existing-ds-test.yml
+++ b/.github/workflows/ca-existing-ds-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-existing-nssdb-test.yml b/.github/workflows/ca-existing-nssdb-test.yml
index 647b6a20f2a..b65f201112d 100644
--- a/.github/workflows/ca-existing-nssdb-test.yml
+++ b/.github/workflows/ca-existing-nssdb-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-hsm-test.yml b/.github/workflows/ca-hsm-test.yml
index 9d9da5ed543..1a42b7d1a9a 100644
--- a/.github/workflows/ca-hsm-test.yml
+++ b/.github/workflows/ca-hsm-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing_CA_with_HSM.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-notification-request-test.yml b/.github/workflows/ca-notification-request-test.yml
index b96cee5d0a9..065ba6bc534 100644
--- a/.github/workflows/ca-notification-request-test.yml
+++ b/.github/workflows/ca-notification-request-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-publishing-ca-cert-test.yml b/.github/workflows/ca-publishing-ca-cert-test.yml
index 71aeaf7257a..c49fe36c06b 100644
--- a/.github/workflows/ca-publishing-ca-cert-test.yml
+++ b/.github/workflows/ca-publishing-ca-cert-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/Publishing-CA-Certificate-to-LDAP-Server
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-publishing-crl-file-test.yml b/.github/workflows/ca-publishing-crl-file-test.yml
index 8d7793275bf..0c74621c91a 100644
--- a/.github/workflows/ca-publishing-crl-file-test.yml
+++ b/.github/workflows/ca-publishing-crl-file-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/Publishing-CRL-to-File-System
@@ -38,7 +41,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-publishing-crl-ldap-test.yml b/.github/workflows/ca-publishing-crl-ldap-test.yml
index 0bad8dd00ad..0c9a9db630d 100644
--- a/.github/workflows/ca-publishing-crl-ldap-test.yml
+++ b/.github/workflows/ca-publishing-crl-ldap-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/Publishing-CRL-to-LDAP-Server
@@ -38,7 +41,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-publishing-user-cert-test.yml b/.github/workflows/ca-publishing-user-cert-test.yml
index 60c90231a1d..2462fac3d66 100644
--- a/.github/workflows/ca-publishing-user-cert-test.yml
+++ b/.github/workflows/ca-publishing-user-cert-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-rsa-pss-test.yml b/.github/workflows/ca-rsa-pss-test.yml
index 50073dd69b4..430ff0bfebb 100644
--- a/.github/workflows/ca-rsa-pss-test.yml
+++ b/.github/workflows/ca-rsa-pss-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing-CA-with-RSA-PSS.adoc
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-rsnv1-test.yml b/.github/workflows/ca-rsnv1-test.yml
index ec4f5505495..f0f910174b9 100644
--- a/.github/workflows/ca-rsnv1-test.yml
+++ b/.github/workflows/ca-rsnv1-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/Installing-CA-with-Random-Serial-Numbers-v1
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-secure-ds-test.yml b/.github/workflows/ca-secure-ds-test.yml
index d68fc50abec..1c912fe0a8a 100644
--- a/.github/workflows/ca-secure-ds-test.yml
+++ b/.github/workflows/ca-secure-ds-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing_CA_with_Secure_Database_Connection.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-sequential-test.yml b/.github/workflows/ca-sequential-test.yml
index 0048f5eefc0..fdf188b4c84 100644
--- a/.github/workflows/ca-sequential-test.yml
+++ b/.github/workflows/ca-sequential-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-shared-token-test.yml b/.github/workflows/ca-shared-token-test.yml
index 44587217ca0..7c8082c9094 100644
--- a/.github/workflows/ca-shared-token-test.yml
+++ b/.github/workflows/ca-shared-token-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/Issuing-User-Certificate-with-CMC-Shared-Token
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ca-tests.yml b/.github/workflows/ca-tests.yml
index 4a0503fcdb5..2fbbe3348e0 100644
--- a/.github/workflows/ca-tests.yml
+++ b/.github/workflows/ca-tests.yml
@@ -97,6 +97,7 @@ jobs:
     uses: ./.github/workflows/ca-basic-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-ecc-test:
     name: CA with ECC
@@ -106,6 +107,7 @@ jobs:
     uses: ./.github/workflows/ca-ecc-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-rsa-pss-test:
     name: CA with RSA/PSS
@@ -115,6 +117,7 @@ jobs:
     uses: ./.github/workflows/ca-rsa-pss-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-existing-certs-test:
     name: CA with existing certs
@@ -124,6 +127,7 @@ jobs:
     uses: ./.github/workflows/ca-existing-certs-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-existing-nssdb-test:
     name: CA with existing NSS database
@@ -133,6 +137,7 @@ jobs:
     uses: ./.github/workflows/ca-existing-nssdb-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-existing-ds-test:
     name: CA with existing DS
@@ -142,6 +147,7 @@ jobs:
     uses: ./.github/workflows/ca-existing-ds-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-shared-token-test:
     name: CA with shared token
@@ -151,6 +157,7 @@ jobs:
     uses: ./.github/workflows/ca-shared-token-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-hsm-test:
     name: CA with HSM
@@ -160,6 +167,7 @@ jobs:
     uses: ./.github/workflows/ca-hsm-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-container-test:
     name: CA container
@@ -169,6 +177,7 @@ jobs:
     uses: ./.github/workflows/ca-container-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-ds-connection-test:
     name: CA connection with DS
@@ -178,6 +187,7 @@ jobs:
     uses: ./.github/workflows/ca-ds-connection-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   subca-basic-test:
     name: Basic Sub-CA
@@ -187,6 +197,7 @@ jobs:
     uses: ./.github/workflows/subca-basic-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   subca-cmc-test:
     name: Sub-CA with CMC
@@ -196,6 +207,7 @@ jobs:
     uses: ./.github/workflows/subca-cmc-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   subca-external-test:
     name: Sub-CA with external cert
@@ -205,3 +217,4 @@ jobs:
     uses: ./.github/workflows/subca-external-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
diff --git a/.github/workflows/ca-tests2.yml b/.github/workflows/ca-tests2.yml
index 2c20160c6df..7afa4d72da8 100644
--- a/.github/workflows/ca-tests2.yml
+++ b/.github/workflows/ca-tests2.yml
@@ -79,6 +79,7 @@ jobs:
     uses: ./.github/workflows/ca-clone-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-secure-ds-test:
     name: CA with secure DS
@@ -88,6 +89,7 @@ jobs:
     uses: ./.github/workflows/ca-secure-ds-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-clone-secure-ds-test:
     name: CA clone with secure DS
@@ -97,6 +99,7 @@ jobs:
     uses: ./.github/workflows/ca-clone-secure-ds-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-rsnv1-test:
     name: CA with RSNv1
@@ -106,6 +109,7 @@ jobs:
     uses: ./.github/workflows/ca-rsnv1-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-sequential-test:
     name: CA with Sequential Serial Numbers
@@ -115,6 +119,7 @@ jobs:
     uses: ./.github/workflows/ca-sequential-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-crl-test:
     name: CA CRL database
@@ -124,6 +129,7 @@ jobs:
     uses: ./.github/workflows/ca-crl-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-publishing-ca-cert-test:
     name: CA with CA cert publishing
@@ -133,6 +139,7 @@ jobs:
     uses: ./.github/workflows/ca-publishing-ca-cert-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-publishing-user-cert-test:
     name: CA with user cert publishing
@@ -142,6 +149,7 @@ jobs:
     uses: ./.github/workflows/ca-publishing-user-cert-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-publishing-crl-file-test:
     name: CA with file-based CRL publishing
@@ -151,6 +159,7 @@ jobs:
     uses: ./.github/workflows/ca-publishing-crl-file-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-publishing-crl-ldap-test:
     name: CA with LDAP-based CRL publishing
@@ -160,6 +169,7 @@ jobs:
     uses: ./.github/workflows/ca-publishing-crl-ldap-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ca-notification-request-test:
     name: CA with request notification
@@ -169,6 +179,7 @@ jobs:
     uses: ./.github/workflows/ca-notification-request-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   scep-test:
     name: SCEP responder
@@ -178,3 +189,4 @@ jobs:
     uses: ./.github/workflows/scep-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
diff --git a/.github/workflows/ipa-acme-test.yml b/.github/workflows/ipa-acme-test.yml
index 766b452b7ff..10c3f54a19e 100644
--- a/.github/workflows/ipa-acme-test.yml
+++ b/.github/workflows/ipa-acme-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
diff --git a/.github/workflows/ipa-basic-test.yml b/.github/workflows/ipa-basic-test.yml
index 1fb61124e3d..b05a9d74abd 100644
--- a/.github/workflows/ipa-basic-test.yml
+++ b/.github/workflows/ipa-basic-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
diff --git a/.github/workflows/ipa-clone-test.yml b/.github/workflows/ipa-clone-test.yml
index 91cd02ed588..cd529709669 100644
--- a/.github/workflows/ipa-clone-test.yml
+++ b/.github/workflows/ipa-clone-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
diff --git a/.github/workflows/ipa-tests.yml b/.github/workflows/ipa-tests.yml
index c6d866aa8dd..3e25b2be3c0 100644
--- a/.github/workflows/ipa-tests.yml
+++ b/.github/workflows/ipa-tests.yml
@@ -79,6 +79,7 @@ jobs:
     uses: ./.github/workflows/ipa-basic-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ipa-acme-test:
     name: IPA ACME
@@ -88,6 +89,7 @@ jobs:
     uses: ./.github/workflows/ipa-acme-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ipa-clone-test:
     name: IPA clone
@@ -97,3 +99,4 @@ jobs:
     uses: ./.github/workflows/ipa-clone-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
diff --git a/.github/workflows/kra-basic-test.yml b/.github/workflows/kra-basic-test.yml
index 6a66f3bd120..3972d1173d6 100644
--- a/.github/workflows/kra-basic-test.yml
+++ b/.github/workflows/kra-basic-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/kra/Installing_KRA.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/kra-clone-test.yml b/.github/workflows/kra-clone-test.yml
index a1723f93d3b..969e059336d 100644
--- a/.github/workflows/kra-clone-test.yml
+++ b/.github/workflows/kra-clone-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/kra/Installing_KRA_Clone.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh primaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: primaryds.example.com
           PASSWORD: Secret.123
 
@@ -80,7 +83,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh secondaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: secondaryds.example.com
           PASSWORD: Secret.123
 
@@ -142,7 +145,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh tertiaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: tertiaryds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/kra-cmc-test.yml b/.github/workflows/kra-cmc-test.yml
index c82fd37fd90..cece96d8858 100644
--- a/.github/workflows/kra-cmc-test.yml
+++ b/.github/workflows/kra-cmc-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/kra/Installing_KRA_with_External_Certificates.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -75,7 +78,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh krads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: krads.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/kra-external-certs-test.yml b/.github/workflows/kra-external-certs-test.yml
index a4652f2e04c..050ee471f22 100644
--- a/.github/workflows/kra-external-certs-test.yml
+++ b/.github/workflows/kra-external-certs-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/kra/Installing_KRA_with_External_Certificates.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -75,7 +78,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh krads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: krads.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/kra-rsnv3-test.yml b/.github/workflows/kra-rsnv3-test.yml
index 2aa8746ea49..eb4f9f982c3 100644
--- a/.github/workflows/kra-rsnv3-test.yml
+++ b/.github/workflows/kra-rsnv3-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/Installing-KRA-with-Random-Serial-Numbers-v3
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/kra-separate-test.yml b/.github/workflows/kra-separate-test.yml
index 9908610e6ce..da89bb45182 100644
--- a/.github/workflows/kra-separate-test.yml
+++ b/.github/workflows/kra-separate-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/kra/Installing_KRA_on_Separate_Instance.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -70,7 +73,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh krads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: krads.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/kra-standalone-test.yml b/.github/workflows/kra-standalone-test.yml
index 6ac89217f0f..a5d25db1773 100644
--- a/.github/workflows/kra-standalone-test.yml
+++ b/.github/workflows/kra-standalone-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/kra-tests.yml b/.github/workflows/kra-tests.yml
index 56495a4b6cb..4d33a64597c 100644
--- a/.github/workflows/kra-tests.yml
+++ b/.github/workflows/kra-tests.yml
@@ -79,6 +79,7 @@ jobs:
     uses: ./.github/workflows/kra-basic-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   kra-separate-test:
     name: KRA on separate instance
@@ -88,6 +89,7 @@ jobs:
     uses: ./.github/workflows/kra-separate-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   kra-external-certs-test:
     name: KRA with external certs
@@ -97,6 +99,7 @@ jobs:
     uses: ./.github/workflows/kra-external-certs-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   kra-cmc-test:
     name: KRA with CMC
@@ -106,6 +109,7 @@ jobs:
     uses: ./.github/workflows/kra-cmc-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   kra-clone-test:
     name: KRA clone
@@ -115,6 +119,7 @@ jobs:
     uses: ./.github/workflows/kra-clone-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   kra-standalone-test:
     name: Standalone KRA
@@ -124,6 +129,7 @@ jobs:
     uses: ./.github/workflows/kra-standalone-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   kra-rsnv3-test:
     name: KRA with RSNv3
@@ -133,3 +139,4 @@ jobs:
     uses: ./.github/workflows/kra-rsnv3-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
diff --git a/.github/workflows/ocsp-basic-test.yml b/.github/workflows/ocsp-basic-test.yml
index c93d68e0f82..d1bfb470420 100644
--- a/.github/workflows/ocsp-basic-test.yml
+++ b/.github/workflows/ocsp-basic-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ocsp/Installing_OCSP.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ocsp-clone-test.yml b/.github/workflows/ocsp-clone-test.yml
index b570673e7fa..1f447bd19a1 100644
--- a/.github/workflows/ocsp-clone-test.yml
+++ b/.github/workflows/ocsp-clone-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ocsp/Installing_OCSP_Clone.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh primaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: primaryds.example.com
           PASSWORD: Secret.123
 
@@ -78,7 +81,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh secondaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: secondaryds.example.com
           PASSWORD: Secret.123
 
@@ -138,7 +141,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh tertiaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: tertiaryds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ocsp-cmc-test.yml b/.github/workflows/ocsp-cmc-test.yml
index 77b1f1292f4..1e206d55388 100644
--- a/.github/workflows/ocsp-cmc-test.yml
+++ b/.github/workflows/ocsp-cmc-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ocsp/Installing_OCSP_with_External_Certificates.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -75,7 +78,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ocspds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ocspds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ocsp-crl-direct-test.yml b/.github/workflows/ocsp-crl-direct-test.yml
index 66c179b8ef3..9311a68d03e 100644
--- a/.github/workflows/ocsp-crl-direct-test.yml
+++ b/.github/workflows/ocsp-crl-direct-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/Installing-Standalone-OCSP
@@ -39,7 +42,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -78,7 +81,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ocspds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ocspds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ocsp-crl-ldap-test.yml b/.github/workflows/ocsp-crl-ldap-test.yml
index 0b9d7450101..0ed4eedf49d 100644
--- a/.github/workflows/ocsp-crl-ldap-test.yml
+++ b/.github/workflows/ocsp-crl-ldap-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/Installing-Standalone-OCSP
@@ -40,7 +43,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -79,7 +82,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ocspds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ocspds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ocsp-external-certs-test.yml b/.github/workflows/ocsp-external-certs-test.yml
index 327d0381142..cf7bd6a9199 100644
--- a/.github/workflows/ocsp-external-certs-test.yml
+++ b/.github/workflows/ocsp-external-certs-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ocsp/Installing_OCSP_with_External_Certificates.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -75,7 +78,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ocspds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ocspds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ocsp-separate-test.yml b/.github/workflows/ocsp-separate-test.yml
index 652c852c239..47ad4ffd6b5 100644
--- a/.github/workflows/ocsp-separate-test.yml
+++ b/.github/workflows/ocsp-separate-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -69,7 +72,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ocspds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ocspds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/ocsp-tests.yml b/.github/workflows/ocsp-tests.yml
index a84d612b2c9..25352ab3cd5 100644
--- a/.github/workflows/ocsp-tests.yml
+++ b/.github/workflows/ocsp-tests.yml
@@ -79,6 +79,7 @@ jobs:
     uses: ./.github/workflows/ocsp-basic-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ocsp-separate-test:
     name: OCSP on separate instance
@@ -88,6 +89,7 @@ jobs:
     uses: ./.github/workflows/ocsp-separate-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ocsp-external-certs-test:
     name: OCSP with external certs
@@ -97,6 +99,7 @@ jobs:
     uses: ./.github/workflows/ocsp-external-certs-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ocsp-cmc-test:
     name: OCSP with CMC
@@ -106,6 +109,7 @@ jobs:
     uses: ./.github/workflows/ocsp-cmc-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ocsp-clone-test:
     name: OCSP clone
@@ -115,6 +119,7 @@ jobs:
     uses: ./.github/workflows/ocsp-clone-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ocsp-crl-direct-test:
     name: OCSP with direct CRL publishing
@@ -124,6 +129,7 @@ jobs:
     uses: ./.github/workflows/ocsp-crl-direct-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   ocsp-crl-ldap-test:
     name: OCSP with LDAP-based CRL publishing
@@ -133,3 +139,4 @@ jobs:
     uses: ./.github/workflows/ocsp-crl-ldap-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
diff --git a/.github/workflows/pki-nss-aes-test.yml b/.github/workflows/pki-nss-aes-test.yml
index 78e9d4a7ff2..db48bd17694 100644
--- a/.github/workflows/pki-nss-aes-test.yml
+++ b/.github/workflows/pki-nss-aes-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/PKI-NSS-CLI
diff --git a/.github/workflows/pki-nss-ecc-test.yml b/.github/workflows/pki-nss-ecc-test.yml
index e60479f5866..5e14975e6cf 100644
--- a/.github/workflows/pki-nss-ecc-test.yml
+++ b/.github/workflows/pki-nss-ecc-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/PKI-NSS-CLI
diff --git a/.github/workflows/pki-nss-exts-test.yml b/.github/workflows/pki-nss-exts-test.yml
index df259167f05..83d1e7a7fe8 100644
--- a/.github/workflows/pki-nss-exts-test.yml
+++ b/.github/workflows/pki-nss-exts-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/PKI-NSS-CLI
diff --git a/.github/workflows/pki-nss-hsm-test.yml b/.github/workflows/pki-nss-hsm-test.yml
index 138d2fed1b3..28d315bd9af 100644
--- a/.github/workflows/pki-nss-hsm-test.yml
+++ b/.github/workflows/pki-nss-hsm-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/PKI-NSS-CLI
diff --git a/.github/workflows/pki-nss-rsa-test.yml b/.github/workflows/pki-nss-rsa-test.yml
index 3a279e53bd3..da858fc2c4a 100644
--- a/.github/workflows/pki-nss-rsa-test.yml
+++ b/.github/workflows/pki-nss-rsa-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/PKI-NSS-CLI
diff --git a/.github/workflows/pki-pkcs11-test.yml b/.github/workflows/pki-pkcs11-test.yml
index 56a6714c226..3819313d44c 100644
--- a/.github/workflows/pki-pkcs11-test.yml
+++ b/.github/workflows/pki-pkcs11-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/PKI-PKCS11-CLI
diff --git a/.github/workflows/pki-pkcs12-test.yml b/.github/workflows/pki-pkcs12-test.yml
index c99d61a7c53..eb83932af9f 100644
--- a/.github/workflows/pki-pkcs12-test.yml
+++ b/.github/workflows/pki-pkcs12-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # https://github.com/dogtagpki/pki/wiki/PKI-PKCS12-CLI
diff --git a/.github/workflows/pki-pkcs7-test.yml b/.github/workflows/pki-pkcs7-test.yml
index 1ddba4e5473..b61b7b57ae2 100644
--- a/.github/workflows/pki-pkcs7-test.yml
+++ b/.github/workflows/pki-pkcs7-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/user/tools/Using-PKI-PKCS7-CLI.adoc
diff --git a/.github/workflows/rpminspect-test.yml b/.github/workflows/rpminspect-test.yml
index 73e8100e29e..e2ce3c1dd0b 100644
--- a/.github/workflows/rpminspect-test.yml
+++ b/.github/workflows/rpminspect-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
diff --git a/.github/workflows/scep-test.yml b/.github/workflows/scep-test.yml
index 49c74f9f74c..c6c59fca1fd 100644
--- a/.github/workflows/scep-test.yml
+++ b/.github/workflows/scep-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/server-basic-test.yml b/.github/workflows/server-basic-test.yml
index b41a1fb10ef..ad99fac0fca 100644
--- a/.github/workflows/server-basic-test.yml
+++ b/.github/workflows/server-basic-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/server/Installing_Basic_PKI_Server.md
diff --git a/.github/workflows/server-container-test.yml b/.github/workflows/server-container-test.yml
index f7394236975..6e0808dfac1 100644
--- a/.github/workflows/server-container-test.yml
+++ b/.github/workflows/server-container-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
diff --git a/.github/workflows/server-https-jks-test.yml b/.github/workflows/server-https-jks-test.yml
index 6e604e851b5..61c46c183ab 100644
--- a/.github/workflows/server-https-jks-test.yml
+++ b/.github/workflows/server-https-jks-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/admin/server/Configuring-HTTPS-Connector-with-JKS-File.adoc
diff --git a/.github/workflows/server-https-nss-test.yml b/.github/workflows/server-https-nss-test.yml
index e778e236302..39aeee47ef3 100644
--- a/.github/workflows/server-https-nss-test.yml
+++ b/.github/workflows/server-https-nss-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/admin/server/Configuring-HTTPS-Connector-with-NSS-Database.adoc
diff --git a/.github/workflows/server-https-pem-test.yml b/.github/workflows/server-https-pem-test.yml
index bb29b7a2949..2322e512b51 100644
--- a/.github/workflows/server-https-pem-test.yml
+++ b/.github/workflows/server-https-pem-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/admin/server/Configuring-HTTPS-Connector-with-PEM-Files.adoc
diff --git a/.github/workflows/server-https-pkcs12-test.yml b/.github/workflows/server-https-pkcs12-test.yml
index 5042e7052a6..e86175b0f86 100644
--- a/.github/workflows/server-https-pkcs12-test.yml
+++ b/.github/workflows/server-https-pkcs12-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/admin/server/Configuring-HTTPS-Connector-with-PKCS12-File.adoc
diff --git a/.github/workflows/server-tests.yml b/.github/workflows/server-tests.yml
index 961e2444839..cf6daaf98ee 100644
--- a/.github/workflows/server-tests.yml
+++ b/.github/workflows/server-tests.yml
@@ -97,6 +97,7 @@ jobs:
     uses: ./.github/workflows/server-basic-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   server-https-pem-test:
     name: HTTPS connector with PEM files
@@ -106,6 +107,7 @@ jobs:
     uses: ./.github/workflows/server-https-pem-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   server-https-jks-test:
     name: HTTPS connector with JKS file
@@ -115,6 +117,7 @@ jobs:
     uses: ./.github/workflows/server-https-jks-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   server-https-pkcs12-test:
     name: "HTTPS connector with PKCS #12 file"
@@ -124,6 +127,7 @@ jobs:
     uses: ./.github/workflows/server-https-pkcs12-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   server-https-nss-test:
     name: HTTPS connector with NSS database
@@ -133,6 +137,7 @@ jobs:
     uses: ./.github/workflows/server-https-nss-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   server-upgrade-test:
     name: Server upgrade
@@ -142,6 +147,7 @@ jobs:
     uses: ./.github/workflows/server-upgrade-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   server-container-test:
     name: Server container
@@ -151,3 +157,4 @@ jobs:
     uses: ./.github/workflows/server-container-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
diff --git a/.github/workflows/server-upgrade-test.yml b/.github/workflows/server-upgrade-test.yml
index 1fdda9d177a..c5c8ff97d4c 100644
--- a/.github/workflows/server-upgrade-test.yml
+++ b/.github/workflows/server-upgrade-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
diff --git a/.github/workflows/subca-basic-test.yml b/.github/workflows/subca-basic-test.yml
index 0fe924e0fd6..bbc8ba74487 100644
--- a/.github/workflows/subca-basic-test.yml
+++ b/.github/workflows/subca-basic-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing_Subordinate_CA.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh rootds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: rootds.example.com
           PASSWORD: Secret.123
 
@@ -70,7 +73,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh subds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: subds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/subca-cmc-test.yml b/.github/workflows/subca-cmc-test.yml
index 0833540855b..50b36d38287 100644
--- a/.github/workflows/subca-cmc-test.yml
+++ b/.github/workflows/subca-cmc-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing_CA_with_External_CA_Signing_Certificate.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh rootds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: rootds.example.com
           PASSWORD: Secret.123
 
@@ -91,7 +94,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh subds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: subds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/subca-external-test.yml b/.github/workflows/subca-external-test.yml
index 87410295cf8..aeaa7e6023b 100644
--- a/.github/workflows/subca-external-test.yml
+++ b/.github/workflows/subca-external-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/ca/Installing_CA_with_External_CA_Signing_Certificate.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/tks-basic-test.yml b/.github/workflows/tks-basic-test.yml
index a7487f31813..20d02d3b844 100644
--- a/.github/workflows/tks-basic-test.yml
+++ b/.github/workflows/tks-basic-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/tks/Installing_TKS.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/tks-clone-test.yml b/.github/workflows/tks-clone-test.yml
index 75056b82d9c..67309fe6b96 100644
--- a/.github/workflows/tks-clone-test.yml
+++ b/.github/workflows/tks-clone-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/tks/Installing_TKS_Clone.md
@@ -36,7 +39,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh primaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: primaryds.example.com
           PASSWORD: Secret.123
 
@@ -80,7 +83,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh secondaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: secondaryds.example.com
           PASSWORD: Secret.123
 
@@ -140,7 +143,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh tertiaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: tertiaryds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/tks-external-certs-test.yml b/.github/workflows/tks-external-certs-test.yml
index ad3d4c0400a..0303c5e525b 100644
--- a/.github/workflows/tks-external-certs-test.yml
+++ b/.github/workflows/tks-external-certs-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -74,7 +77,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh tksds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: tksds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/tks-separate-test.yml b/.github/workflows/tks-separate-test.yml
index 9ad52319a95..4de51f32ac5 100644
--- a/.github/workflows/tks-separate-test.yml
+++ b/.github/workflows/tks-separate-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -69,7 +72,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh tksds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: tksds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/tks-tests.yml b/.github/workflows/tks-tests.yml
index e4dbcc52821..4d2ebd932c1 100644
--- a/.github/workflows/tks-tests.yml
+++ b/.github/workflows/tks-tests.yml
@@ -79,6 +79,7 @@ jobs:
     uses: ./.github/workflows/tks-basic-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   tks-separate-test:
     name: TKS on separate instance
@@ -88,6 +89,7 @@ jobs:
     uses: ./.github/workflows/tks-separate-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   tks-external-certs-test:
     name: TKS with external certs
@@ -97,6 +99,7 @@ jobs:
     uses: ./.github/workflows/tks-external-certs-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   tks-clone-test:
     name: TKS clone
@@ -106,3 +109,4 @@ jobs:
     uses: ./.github/workflows/tks-clone-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
diff --git a/.github/workflows/tools-tests.yml b/.github/workflows/tools-tests.yml
index 9dd299885d3..0a167b291b3 100644
--- a/.github/workflows/tools-tests.yml
+++ b/.github/workflows/tools-tests.yml
@@ -97,6 +97,7 @@ jobs:
     uses: ./.github/workflows/PKICertImport-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   pki-nss-rsa-test:
     name: PKI NSS CLI with RSA
@@ -106,6 +107,7 @@ jobs:
     uses: ./.github/workflows/pki-nss-rsa-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   pki-nss-ecc-test:
     name: PKI NSS CLI with ECC
@@ -115,6 +117,7 @@ jobs:
     uses: ./.github/workflows/pki-nss-ecc-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   pki-nss-aes-test:
     name: PKI NSS CLI with AES
@@ -124,6 +127,7 @@ jobs:
     uses: ./.github/workflows/pki-nss-aes-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   pki-nss-hsm-test:
     name: PKI NSS CLI with HSM
@@ -133,6 +137,7 @@ jobs:
     uses: ./.github/workflows/pki-nss-hsm-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   pki-nss-exts-test:
     name: PKI NSS CLI with Extensions
@@ -142,6 +147,7 @@ jobs:
     uses: ./.github/workflows/pki-nss-exts-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   pki-pkcs7-test:
     name: PKI PKCS7 CLI
@@ -151,6 +157,7 @@ jobs:
     uses: ./.github/workflows/pki-pkcs7-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   pki-pkcs11-test:
     name: PKI PKCS11 CLI
@@ -160,6 +167,7 @@ jobs:
     uses: ./.github/workflows/pki-pkcs11-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   pki-pkcs12-test:
     name: PKI PKCS12 CLI
@@ -169,6 +177,7 @@ jobs:
     uses: ./.github/workflows/pki-pkcs12-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   rpminspect-test:
     name: rpminspect
@@ -178,6 +187,7 @@ jobs:
     uses: ./.github/workflows/rpminspect-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   update-version-test:
     name: Update Version
diff --git a/.github/workflows/tps-basic-test.yml b/.github/workflows/tps-basic-test.yml
index a66954aecd0..f9ffd194140 100644
--- a/.github/workflows/tps-basic-test.yml
+++ b/.github/workflows/tps-basic-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/tps/Installing_TPS.md
@@ -34,7 +37,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh ds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: ds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/tps-clone-test.yml b/.github/workflows/tps-clone-test.yml
index 0ac0411803e..1b08673d6bf 100644
--- a/.github/workflows/tps-clone-test.yml
+++ b/.github/workflows/tps-clone-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   # docs/installation/tps/Installing_TPS_Clone.md
@@ -36,7 +39,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh primaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: primaryds.example.com
           PASSWORD: Secret.123
 
@@ -106,7 +109,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh secondaryds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: secondaryds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/tps-external-certs-test.yml b/.github/workflows/tps-external-certs-test.yml
index a81956f36ed..d1a8069f486 100644
--- a/.github/workflows/tps-external-certs-test.yml
+++ b/.github/workflows/tps-external-certs-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -74,7 +77,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh krads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: krads.example.com
           PASSWORD: Secret.123
 
@@ -112,7 +115,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh tksds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: tksds.example.com
           PASSWORD: Secret.123
 
@@ -147,7 +150,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh tpsds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: tpsds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/tps-separate-test.yml b/.github/workflows/tps-separate-test.yml
index 3e838db1d0a..ecb146d2034 100644
--- a/.github/workflows/tps-separate-test.yml
+++ b/.github/workflows/tps-separate-test.yml
@@ -6,6 +6,9 @@ on:
       os:
         required: true
         type: string
+      db-image:
+        required: false
+        type: string
 
 jobs:
   test:
@@ -33,7 +36,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh cads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: cads.example.com
           PASSWORD: Secret.123
 
@@ -69,7 +72,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh krads
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: krads.example.com
           PASSWORD: Secret.123
 
@@ -111,7 +114,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh tksds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: tksds.example.com
           PASSWORD: Secret.123
 
@@ -149,7 +152,7 @@ jobs:
         run: |
           tests/bin/ds-container-create.sh tpsds
         env:
-          IMAGE: ${{ needs.init.outputs.db-image }}
+          IMAGE: ${{ inputs.db-image }}
           HOSTNAME: tpsds.example.com
           PASSWORD: Secret.123
 
diff --git a/.github/workflows/tps-tests.yml b/.github/workflows/tps-tests.yml
index 5a3b2513a3e..eb4dd3566ff 100644
--- a/.github/workflows/tps-tests.yml
+++ b/.github/workflows/tps-tests.yml
@@ -79,6 +79,7 @@ jobs:
     uses: ./.github/workflows/tps-basic-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   tps-separate-test:
     name: TPS on separate instance
@@ -88,6 +89,7 @@ jobs:
     uses: ./.github/workflows/tps-separate-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   tps-external-certs-test:
     name: TPS with external certs
@@ -97,6 +99,7 @@ jobs:
     uses: ./.github/workflows/tps-external-certs-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}
 
   tps-clone-test:
     name: TPS clone
@@ -106,3 +109,4 @@ jobs:
     uses: ./.github/workflows/tps-clone-test.yml
     with:
       os: ${{ matrix.os }}
+      db-image: ${{ needs.init.outputs.db-image }}