diff --git a/.github/workflows/build-test-and-push.yaml b/.github/workflows/build-test-and-push.yaml
index 800f345..e6f605c 100644
--- a/.github/workflows/build-test-and-push.yaml
+++ b/.github/workflows/build-test-and-push.yaml
@@ -20,9 +20,14 @@ jobs:
 
     strategy:
       matrix:
-        image:
-          - java-25
-          - node-22
+        include:
+          - language: java
+            version: "25"
+            image: 25-java
+
+          - language: node
+            version: "22"
+            image: 22-node
 
     steps:
       - name: Checkout code
@@ -32,19 +37,19 @@ jobs:
         uses: hadolint/hadolint-action@v3.1.0
         with:
           config: .hadolint.yaml
-          dockerfile: "./${{ matrix.image }}/Dockerfile"
+          dockerfile: "./${{ matrix.language }}/Dockerfile"
 
       - name: Build base image
         uses: docker/build-push-action@v6
         with:
-          context: ./${{ matrix.image }}
+          context: ./${{ matrix.language }}
           push: false
           tags: ${{ matrix.image }}-test:latest
 
       - name: Build test image
         uses: docker/build-push-action@v6
         with:
-          context: ./${{ matrix.image }}/test
+          context: ./${{ matrix.language }}/test
           push: false
           tags: base-image-test:${{ matrix.image }}-test
 
@@ -61,9 +66,14 @@ jobs:
 
     strategy:
       matrix:
-        image:
-          - java-25
-          - node-22
+        include:
+          - language: java
+            version: "25"
+            image: 25-java
+
+          - language: node
+            version: "22"
+            image: 22-node
 
     steps:
       - name: Checkout code
@@ -91,7 +101,7 @@ jobs:
         with:
           images: hsldevcom/infodevops-docker-base-images
           tags: |
-            type=edge,suffix=-${{ matrix.image }},enable={{is_default_branch}}
+            type=edge,prefix=${{ matrix.image }},enable={{is_default_branch}}
             type=semver,suffix=-${{ matrix.image }},pattern={{version}}
             type=semver,suffix=-${{ matrix.image }},pattern={{major}}.{{minor}}
             type=semver,suffix=-${{ matrix.image }},pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/v0.') }}
@@ -102,7 +112,7 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
-          context: ./${{ matrix.image }}
+          context: ./${{ matrix.language }}
           push: true
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/java-25/test/Dockerfile b/java-25/test/Dockerfile
deleted file mode 100644
index 74560e9..0000000
--- a/java-25/test/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM java-25-test:latest
-
-CMD ["echo", "hello"]
\ No newline at end of file
diff --git a/java-25/Dockerfile b/java/Dockerfile
similarity index 100%
rename from java-25/Dockerfile
rename to java/Dockerfile
diff --git a/java/test/Dockerfile b/java/test/Dockerfile
new file mode 100644
index 0000000..658b172
--- /dev/null
+++ b/java/test/Dockerfile
@@ -0,0 +1,3 @@
+FROM 25-java-test:latest
+
+CMD ["echo", "hello"]
\ No newline at end of file
diff --git a/node-22/Dockerfile b/node/Dockerfile
similarity index 100%
rename from node-22/Dockerfile
rename to node/Dockerfile
diff --git a/node-22/test/Dockerfile b/node/test/Dockerfile
similarity index 93%
rename from node-22/test/Dockerfile
rename to node/test/Dockerfile
index ded40ee..632673d 100644
--- a/node-22/test/Dockerfile
+++ b/node/test/Dockerfile
@@ -1,4 +1,4 @@
-FROM node-22-test:latest
+FROM 22-node-test:latest
 
 USER root
 RUN apt-get update \