diff --git a/.github/workflows/build-push-test-docker-image.yml b/.github/workflows/build-push-test-docker-image.yml
index 606c453..2424326 100644
--- a/.github/workflows/build-push-test-docker-image.yml
+++ b/.github/workflows/build-push-test-docker-image.yml
@@ -17,7 +17,6 @@ jobs:
       - name: Build the app
         uses: openconext/build-and-publish-test-container/php82-node20@main
         with:
-          dir_to_include: dev/
           use_yarn: true
 
       - name: Set up QEMU
@@ -33,6 +32,20 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set docker labels and tags
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/openconext/stepup-azuremfa/stepup-azuremfa
+          flavor: |
+            latest=false
+            suffix=-test
+          tags: |
+            type=ref,event=tag
+            type=semver,pattern={{version}}
+            type=sha
+            type=raw,suffix=,value=test
+
       - name: Build and push the TEST image
         uses: docker/build-push-action@v4
         with:
@@ -40,5 +53,5 @@ jobs:
           file: docker/Dockerfile.test
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: |
-            ghcr.io/openconext/stepup-azuremfa/stepup-azuremfa:test
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/component_info b/component_info
index 7dc2c4c..1799dd4 100644
--- a/component_info
+++ b/component_info
@@ -3,3 +3,4 @@ SYMFONY_VERSION=6
 ENCORE=yes
 ASSETIC=no
 NODE_VERSION=20
+TEST_EXTRA_DIRS="dev/ tests/"
diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test
index 269b7ee..ae3ea12 100644
--- a/docker/Dockerfile.test
+++ b/docker/Dockerfile.test
@@ -4,8 +4,8 @@ ADD output.tar /var/www/html/
 # Set the default workdir
 WORKDIR /var/www/html
 # Add the application configuration files
-COPY config/packages/parameters.yaml.dist config/packages/parameters.yaml
-COPY config/packages/institutions.yaml.dist config/packages/institutions.yaml
+COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml
+COPY config/openconext/institutions.yaml.dist config/openconext/institutions.yaml
 COPY config/packages/prod/monolog.yaml.docker config/packages/prod/monolog.yaml
 
 # Add the config files for Apache2