diff --git a/.github/workflows/build-test-and-push.yaml b/.github/workflows/build-test-and-push.yaml
index cc6dc26..235e327 100644
--- a/.github/workflows/build-test-and-push.yaml
+++ b/.github/workflows/build-test-and-push.yaml
@@ -5,6 +5,8 @@ on:
     branches: [ main ]
   push:
     branches: [ main ]
+    tags:
+      - "v*"
   workflow_dispatch:
 
 permissions:
@@ -19,8 +21,6 @@ jobs:
     strategy:
       matrix:
         image:
-          - java-11
-          - java-17
           - java-25
           - node-22
 
@@ -62,8 +62,6 @@ jobs:
     strategy:
       matrix:
         image:
-          - java-11
-          - java-17
           - java-25
           - node-22
 
@@ -93,9 +91,10 @@ jobs:
         with:
           images: hsldevcom/infodevops-docker-base-images
           tags: |
-            type=raw,value=${{ matrix.image }}
-            type=raw,value=${{ matrix.image }}-latest
-            type=sha,prefix=${{ matrix.image }}-
+            type=edge,suffix=${{ 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.') }}
           labels: |
             org.opencontainers.image.title=${{ matrix.image }}
             org.opencontainers.image.vendor=hsldevcom
diff --git a/java-11/Dockerfile b/java-11/Dockerfile
deleted file mode 100644
index a533f06..0000000
--- a/java-11/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# ============================================================
-# HSL InfoDevOps Base Image for Java Microservices (runtime-only)
-# Built for AKS — optimized, secure, slim
-# ============================================================
-
-FROM eclipse-temurin:11-jre-jammy
-
-WORKDIR /app
-
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport -XX:MaxRAMPercentage=75"
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        curl \
-    && rm -rf /var/lib/apt/lists/*
-
-CMD ["java", "-version"]
diff --git a/java-11/test/Dockerfile b/java-11/test/Dockerfile
deleted file mode 100644
index 26bc04c..0000000
--- a/java-11/test/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM java-11-test:latest
-
-CMD ["echo", "hello"]
\ No newline at end of file
diff --git a/java-17/Dockerfile b/java-17/Dockerfile
deleted file mode 100644
index cd74a97..0000000
--- a/java-17/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# ============================================================
-# HSL InfoDevOps Base Image for Java Microservices (runtime-only)
-# Built for AKS — optimized, secure, slim
-# ============================================================
-
-FROM eclipse-temurin:17-jre-jammy
-
-WORKDIR /app
-
-ENV JAVA_TOOL_OPTIONS="-XX:+UseContainerSupport -XX:MaxRAMPercentage=75"
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-        curl \
-    && rm -rf /var/lib/apt/lists/*
-
-CMD ["java", "-version"]
diff --git a/java-17/test/Dockerfile b/java-17/test/Dockerfile
deleted file mode 100644
index 348a85f..0000000
--- a/java-17/test/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM java-17-test:latest
-
-CMD ["echo", "hello"]
\ No newline at end of file