diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f7587ac5a..e99c44be9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,20 +6,14 @@ on:
 
 jobs:
   print-cache-directory:
-    runs-on: ubuntu-latest
+    runs-on: macos-13
     env:
       BUILD_VERSION: $(git rev-parse --short HEAD)
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Cache Maven dependencies
-        run: |
-          echo '{ "features": { "containerd-snapshotter": true } }' | sudo tee /etc/docker/daemon.json
-          sudo systemctl restart docker
-          docker info -f '{{ .DriverStatus }}'
-          docker info
-      # - name: Setup upterm session
-      #   uses: lhotari/action-upterm@v1
-      #   with:
-      #     ## limits ssh access and adds the ssh public key for the user which triggered the workflow ie holashchand
-      #     limit-access-to-actor: true
+      - name: Setup upterm session
+        uses: lhotari/action-upterm@v1
+        with:
+          ## limits ssh access and adds the ssh public key for the user which triggered the workflow ie holashchand
+          limit-access-to-actor: true
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index c85c9b3c1..4043f9c51 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -44,6 +44,7 @@ jobs:
           sudo rm -rf /usr/local/.ghcup
           sudo rm -rf /usr/share/swift
       - name: Setup containerd driver type
+        if: matrix.platform == 'linux/amd64'
         run: |
           echo '{ "features": { "containerd-snapshotter": true } }' | sudo tee /etc/docker/daemon.json
           export BUILDX_EXPERIMENTAL=1
diff --git a/Makefile b/Makefile
index 10e4f2b18..e9334a30e 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ publish-builds:
     	  if [ -n "$$(docker images -q local/$$image:latest)" ]; then \
           	  docker tag local/$$image:latest $(PACKAGE_REPO)$$image:$(BUILD_VERSION); \
           	  echo publish: $(PACKAGE_REPO)$$image:$(BUILD_VERSION); \
-          	  docker push $(PACKAGE_REPO)$$image:$(BUILD_VERSION)-$(BUILD_TARGET); \
+          	  docker push $(PACKAGE_REPO)$$image:$(BUILD_VERSION); \
           else \
           	  echo "Skipping image local/$$image:latest -> does not exist locally"; \
           fi \