diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3dce37c..d7883a0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,28 +26,31 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         name: Check out code
-      
-      - name: Build and push
-        uses: docker/build-push-action@v6
+
+      - uses: mr-smithers-excellent/docker-build-push@v6
+        name: Build Docker standalone image
         with:
-          context: .
-          file: standalone.dockerfile
-          pull: true
-          push: false
+          image: qest
           tags: standalone, standalone-latest, standalone-${{ github.ref_name }}
-          
+          registry: ghcr.io
+          dockerfile: standalone.dockerfile
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          pushImage: false
+  
   build-docker-bundle:
     runs-on: ubuntu-latest    
     steps:
       - uses: actions/checkout@v4
         name: Check out code
-      
-      - name: Build and push
-        uses: docker/build-push-action@v6
+
+      - uses: mr-smithers-excellent/docker-build-push@v6
+        name: Build Docker bundle image
         with:
-          context: .
-          file: bundle.dockerfile
-          pull: true
-          push: false
+          image: qest
           tags: bundle, bundle-latest, bundle-${{ github.ref_name }}
-            
+          registry: ghcr.io
+          dockerfile: bundle.dockerfile
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          pushImage: false
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ee4c8ef..8393674 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,10 +10,10 @@ jobs:
   build-binaries:
     runs-on: ubuntu-latest    
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       
       - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v1.9.0
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 8.x.x
         
@@ -37,10 +37,10 @@ jobs:
   build-docker-standalone:
     runs-on: ubuntu-latest    
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         name: Check out code
 
-      - uses: mr-smithers-excellent/docker-build-push@v5
+      - uses: mr-smithers-excellent/docker-build-push@v6
         name: Build & push Docker standalone image
         with:
           image: qest
@@ -56,7 +56,7 @@ jobs:
       - uses: actions/checkout@v2
         name: Check out code
 
-      - uses: mr-smithers-excellent/docker-build-push@v5
+      - uses: mr-smithers-excellent/docker-build-push@v6
         name: Build & push Docker bundle image
         with:
           image: qest