diff --git a/.github/workflows/build-push-docker-image.yml b/.github/workflows/build-push-docker-image.yml
index 08b89aeb..ce7939ae 100644
--- a/.github/workflows/build-push-docker-image.yml
+++ b/.github/workflows/build-push-docker-image.yml
@@ -2,8 +2,6 @@ name: build-push-docker-image
 
 #on: workflow_dispatch
 on:
-  push:
-    branches: feature/docker_configs
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/build-push-test-docker-image.yml b/.github/workflows/build-push-test-docker-image.yml
new file mode 100644
index 00000000..15fd0a42
--- /dev/null
+++ b/.github/workflows/build-push-test-docker-image.yml
@@ -0,0 +1,58 @@
+name: build-push-test-docker-image
+
+on:
+  push:
+    branches: 
+      - feature/build-and-publish-test-container
+  workflow_dispatch:
+
+jobs:
+  build-push-test-docker-image:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      
+      - name: Build the app
+        uses: openconext/build-and-publish-test-container/php72-node14@main
+        with:
+          use_yarn: false
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          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-ra/stepup-ra
+          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:
+          context: .
+          file: docker/Dockerfile.test
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/component_info b/component_info
index b63d8eb7..bd1ba7b6 100644
--- a/component_info
+++ b/component_info
@@ -4,3 +4,4 @@ ENCORE=yes
 ASSETIC=no
 NODE_VERSION=14
 COMPOSER_VERSION=2
+TEST_EXTRA_DIRS="ci/"
diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test
new file mode 100644
index 00000000..13fadba8
--- /dev/null
+++ b/docker/Dockerfile.test
@@ -0,0 +1,14 @@
+FROM ghcr.io/openconext/openconext-basecontainers/php72-apache2:latest AS php-build
+ADD output.tar /var/www/html/
+# Set the default workdir
+WORKDIR /var/www/html
+# Add the application configuration files
+COPY config/legacy/parameters.yaml.dist config/legacy/parameters.yaml
+COPY config/legacy/samlstepupproviders_parameters.yaml.dist config/legacy/samlstepupproviders_parameters.yaml
+COPY config/packages/prod/monolog.yaml.docker config/packages/prod/monolog.yaml
+# Add the config files for Apache2
+RUN rm -rf /etc/apache2/sites-enabled/*
+COPY ./docker/conf/ra-apache2.conf /etc/apache2/sites-enabled/ra.conf
+RUN rm -rf /var/www/html/var/cache/prod && chown -R www-data /var/www/html/var
+
+CMD ["apache2-foreground"]