diff --git a/.github/actions/run-deployment-test/action.yml b/.github/actions/run-deployment-test/action.yml
index eb7aa820e..b5ae81d96 100644
--- a/.github/actions/run-deployment-test/action.yml
+++ b/.github/actions/run-deployment-test/action.yml
@@ -25,7 +25,7 @@ description: "Build and publish a Docker Image to DockerHub"
 inputs:
   imagename:
     required: true
-    description: "name of the docker image, e.g. edc-runtime-memory"
+    description: "list of docker image names separated by whitespace, e.g. 'edc-runtime-memory edc-runtime-other'"
 
   image_tag:
     required: false
@@ -38,7 +38,7 @@ inputs:
 
   rootDir:
     required: true
-    description: "The directory that contains the docker file, e.g. edc-controlplane/edc-runtime-memory"
+    description: "list of directories of the modules to be dockerized, separated by whitespace, e.g. 'edc-controlplane/edc-runtime-memory edc-dataplane/edc-dataplane-memory'"
 
   k8sversion:
     required: false
@@ -69,12 +69,19 @@ runs:
     - name: Build docker images
       shell: bash
       run: |-
-        ./gradlew -p ${{ inputs.rootDir }} dockerize
+        modules=(${{ inputs.rootDir }})
+        for module in "${modules[@]}"
+        do
+          ./gradlew -p $module dockerize
+        done
 
     - name: Load images into KinD
       shell: bash
       run: |
-        kind get clusters | xargs -n1 kind load docker-image ${{ inputs.imagename }}:${{ inputs.image_tag }} --name
+        images=(${{ inputs.imagename }})
+        versioned=( "${images[@]/%/:${{ inputs.image_tag }}}" )
+        versioned_images=$(IFS=' ' ; echo "${versioned[*]}")
+        kind get clusters | xargs -n1 kind load docker-image $versioned_images --name
 
     ###################################################
     # Install the test infrastructure
diff --git a/.github/workflows/deployment-test.yaml b/.github/workflows/deployment-test.yaml
index 281ff66c4..3851ecb98 100644
--- a/.github/workflows/deployment-test.yaml
+++ b/.github/workflows/deployment-test.yaml
@@ -91,7 +91,7 @@ jobs:
         name: "Run deployment test using KinD and Helm"
         with:
           imagename: "edc-controlplane-postgresql-hashicorp-vault edc-dataplane-hashicorp-vault"
-          rootDir: "."
+          rootDir: "edc-controlplane/edc-controlplane-postgresql-hashicorp-vault edc-dataplane/edc-dataplane-hashicorp-vault"
           k8sversion: ${{ matrix.k8s-version }}
           helm_command: |-
             helm install tx-prod charts/tractusx-connector \
@@ -125,7 +125,7 @@ jobs:
         name: "Run deployment test using KinD and Helm"
         with:
           imagename: "edc-controlplane-postgresql-azure-vault edc-dataplane-azure-vault"
-          rootDir: "."
+          rootDir: "edc-controlplane/edc-controlplane-postgresql-azure-vault edc-dataplane/edc-dataplane-azure-vault"
           helm_command: |-
             az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name aes-keys --value "$(cat aes.key)" > /dev/null
             az keyvault secret set --vault-name ${{ secrets.AZURE_VAULT_NAME }} --name client-secret --value "$(cat client.secret)" > /dev/null