diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index f930eae..aa255a3 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -84,16 +84,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: bcgov-nr/action-builder-ghcr@v2.0.2
+      - uses: bcgov-nr/action-builder-ghcr@v2.2.0
         with:
           package: ${{ matrix.package }}
-          tag: ${{ needs.semantic-release.outputs.tag }}
+          tag: ${{ needs.semantic-release.outputs.version }}
           token: ${{ secrets.GITHUB_TOKEN }}
           build_file: ${{ matrix.build_file }}
           build_context: ${{ matrix.build_context }}
           triggers: ${{ matrix.triggers }}
           build_args: |
-            APP_VERSION=${{ needs.semantic-release.outputs.tag }}
+            APP_VERSION=${{ needs.semantic-release.outputs.version }}
   helm-release:
     runs-on: ubuntu-22.04
     needs: [builds,semantic-release]
diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index b59f6cc..d0cb7f0 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: bcgov-nr/action-builder-ghcr@v2.0.2
+      - uses: bcgov-nr/action-builder-ghcr@v2.2.0
         with:
           package: ${{ matrix.package }}
           tag: ${{ github.event.number }}
@@ -57,7 +57,7 @@ jobs:
       secret_path_env: dev # this path is different from the path in the broker
     steps:
       - uses: actions/checkout@v4
-      
+
       - name: Deploy to Openshift
         working-directory: charts/nr-oracle-service
         shell: bash
diff --git a/Dockerfile b/Dockerfile
index 83ed954..64613bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN ./mvnw package -Pnative -DskipTests
 #RUN ./mvnw package -DskipTests for JVM mode
 HEALTHCHECK --interval=300s --timeout=30s CMD ./mvnw --version  || exit 1
 ###
-FROM quay.io/quarkus/quarkus-micro-image:2.0
+FROM quay.io/quarkus/quarkus-micro-image:2.0 as deploy
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
diff --git a/Dockerfile.certs b/Dockerfile.certs
index 4e5a9f2..ecf403d 100644
--- a/Dockerfile.certs
+++ b/Dockerfile.certs
@@ -1,9 +1,9 @@
 #This Dockerfile mounts the certs
-FROM eclipse-temurin:21.0.4_7-jdk-alpine AS buildCert
+FROM eclipse-temurin:21.0.4_7-jdk-alpine AS build-cert
 
-ENV LANG en_CA.UTF-8
-ENV LANGUAGE en_CA.UTF-8
-ENV LC_ALL en_CA.UTF-8
+ENV LANG=en_CA.UTF-8
+ENV LANGUAGE=en_CA.UTF-8
+ENV LC_ALL=en_CA.UTF-8
 WORKDIR /app
 
 RUN apk --no-cache add openssl
diff --git a/pom.xml b/pom.xml
index 4333ec7..01842c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <artifactId>nr-oracle-service</artifactId>
   <version>0.2.25</version>
   <properties>
-    <compiler-plugin.version>3.12.1</compiler-plugin.version>
+    <compiler-plugin.version>3.13.0</compiler-plugin.version>
     <maven.compiler.release>21</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -14,7 +14,7 @@
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
     <quarkus.platform.version>3.13.2</quarkus.platform.version>
     <skipITs>true</skipITs>
-    <surefire-plugin.version>3.2.5</surefire-plugin.version>
+    <surefire-plugin.version>3.4.0</surefire-plugin.version>
   </properties>
   <dependencyManagement>
     <dependencies>