diff --git a/.github/workflows/docker-manual-triggered-test.yml b/.github/workflows/docker-manual-triggered-test.yml
index 1695a61..2c6cc42 100644
--- a/.github/workflows/docker-manual-triggered-test.yml
+++ b/.github/workflows/docker-manual-triggered-test.yml
@@ -11,40 +11,41 @@ jobs:
   gcr-dockerhub-build-publish:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
+      - name: Update runc (temporary fix) # TODO: Remove step when https://github.com/actions/virtual-environments/issues/2658 fixed
+        run: |
+          sudo apt-get install libseccomp-dev
+          git clone https://github.com/opencontainers/runc
+          cd runc
+          make
+          sudo make install
+      - name: Login to Docker Hub
         uses: docker/login-action@v1 
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
+      - name: Login to GitHub Container Registry
         uses: docker/login-action@v1 
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
-      -
-        name: Show Runners environment (debug)
+      - name: Show Runners environment (debug)
         shell: bash
         run: export
-      -
-        name: Build and Push to GCR and Docker Hub
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: |
-            ${{ github.repository }}:${{ github.event.inputs.tags }}
-            ghcr.io/${{ github.repository }}:${{ github.event.inputs.tags }}
+      - name: Build Docker image and tag
+        run: |
+          docker build \
+            --tag ${{ github.repository }}:latest \
+            --tag ${{ github.repository }}:${{ steps.identify_tag.outputs.tag }} \
+            --tag ghcr.io/${{ github.repository }}:latest \
+            --tag ghcr.io/${{ github.repository }}:${{ steps.identify_tag.outputs.tag }} \
+            .
+      - name: Push Docker image to Docker Hub
+        run: |
+          docker push ${{ github.repository }}:${{ github.event.inputs.tags }}
+      - name: Push Docker image to GitHub Container Registry (GHCR)
+        run: |
+          docker push ghcr.io/${{ github.repository }}:${{ github.event.inputs.tags }}
+          docker push ghcr.io/${{ github.repository }}:${{ github.event.inputs.tags }}
\ No newline at end of file
diff --git a/.github/workflows/docker-tag-triggered-prod.yml b/.github/workflows/docker-tag-triggered-prod.yml
index 69d0331..2c1b8bd 100644
--- a/.github/workflows/docker-tag-triggered-prod.yml
+++ b/.github/workflows/docker-tag-triggered-prod.yml
@@ -9,34 +9,30 @@ jobs:
   gcr-dockerhub-build-publish:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
+      - name: Checkout
         uses: actions/checkout@v2
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-      -
-        name: Login to DockerHub
+      - name: Update runc (temporary fix) # TODO: Remove step when https://github.com/actions/virtual-environments/issues/2658 fixed
+        run: |
+          sudo apt-get install libseccomp-dev
+          git clone https://github.com/opencontainers/runc
+          cd runc
+          make
+          sudo make install
+      - name: Login to Docker Hub
         uses: docker/login-action@v1 
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Login to GitHub Container Registry
+      - name: Login to GitHub Container Registry (GHCR)
         uses: docker/login-action@v1 
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
-      -
-        name: Show Runners environment (debug)
+      - name: Show Runners environment (debug)
         shell: bash
         run: export
-      -
-        name: Identify GitHub tag name
+      - name: Identify GitHub tag name
         shell: bash
         # get tag name from runners environment 'GITHUB_REF' and then use bash substring
         # to strip out '+' symbol - required due to gcr not supporting this as a tag 
@@ -44,16 +40,19 @@ jobs:
         # note if push is NOT triggered by tag then 'GITHUB_REF' will be the branch name.
         run: echo "##[set-output name=tag;]$(tag_name=${GITHUB_REF#refs/tags/} && echo "${tag_name//+/-}")"
         id: identify_tag
-      -
-        name: Build and Push to GCR and Docker Hub
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: |
-            ${{ github.repository }}:latest
-            ${{ github.repository }}:${{ steps.identify_tag.outputs.tag }}
-            ghcr.io/${{ github.repository }}:latest
-            ghcr.io/${{ github.repository }}:${{ steps.identify_tag.outputs.tag }}
+      - name: Build Docker image and tag
+        run: |
+          docker build \
+            --tag ${{ github.repository }}:latest \
+            --tag ${{ github.repository }}:${{ steps.identify_tag.outputs.tag }} \
+            --tag ghcr.io/${{ github.repository }}:latest \
+            --tag ghcr.io/${{ github.repository }}:${{ steps.identify_tag.outputs.tag }} \
+            .
+      - name: Push Docker image to Docker Hub
+        run: |
+          docker push ${{ github.repository }}:latest
+          docker push ${{ github.repository }}:${{ steps.identify_tag.outputs.tag }}
+      - name: Push Docker image to GitHub Container Registry (GHCR)
+        run: |
+          docker push ghcr.io/${{ github.repository }}:latest
+          docker push ghcr.io/${{ github.repository }}:${{ steps.identify_tag.outputs.tag }}
\ No newline at end of file