diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 82722de8..0bd8eb64 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -60,6 +60,8 @@ jobs:
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@4b4e9c3e2d4531116a6f8ba8e71fc6e2cb6e6c8c
+      with:
+        driver: docker
 
     - name: Pre build
       run: |
@@ -87,16 +89,19 @@ jobs:
         #docker rmi $(docker images | grep -v IMAGE | awk '{print $3}')
         docker images
 
+        # Remove unneeded and installed software to free up space
+        sudo rm -rf /usr/local/lib/android/sdk
+        sudo rm -rf /opt/hostedtoolcache
+
         # check disk space one more time
         df -h
 
-    - name: Build local docker image for test
-      # if: github.event_name != 'pull_request'
-      run: |
-        TAG=$GITHUB_SHA
-        docker build . \
-            --file Dockerfile \
-            --tag ${{ env.IMAGE_NAME}}:${{ env.TAG}}
+    - name: Build and load local docker image for test
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        load: true
+        tags: ${{ env.IMAGE_NAME}}:${{ env.TAG}}
 
     - name: Inspect local docker image
       run: |