diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
index 849c91b72a..e493f21a09 100644
--- a/.github/workflows/docker-develop.yml
+++ b/.github/workflows/docker-develop.yml
@@ -14,13 +14,38 @@ jobs:
     env:
       DOCKER_BUILDKIT: 1
     steps:
-      -   name: Checkout repository
-          uses: actions/checkout@v2
-
-      -   name: Publish to Docker Hub
-          uses: docker/build-push-action@92e71463491f2d026a477188b8ad3a0fdd9d672c
-          with:
-            repository: iotaledger/goshimmer
-            username: '${{ secrets.IOTALEDGER_HUB_DOCKER_LOGIN }}'
-            password: '${{ secrets.IOTALEDGER_HUB_DOCKER_PASSWORD }}'
-            tags: develop
+      - name: Checkout repository
+        uses: actions/checkout@v2.3.4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1.3.0
+
+      - name: Cache Docker layers
+        uses: actions/cache@v2.1.6
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1.9.0
+        with:
+          username: '${{ secrets.IOTALEDGER_HUB_DOCKER_LOGIN }}'
+          password: '${{ secrets.IOTALEDGER_HUB_DOCKER_PASSWORD }}'
+
+      - name: Publish to Docker Hub
+        uses: docker/build-push-action@v2.5.0
+        with:
+          tags: iotaledger/goshimmer:develop
+          push: true
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
+
+      - # Temp fix
+        # https://github.com/docker/build-push-action/issues/252
+        # https://github.com/moby/buildkit/issues/1896
+        name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 4e4606f467..cda3f4fe2a 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -61,7 +61,6 @@ jobs:
       - name: Pull additional Docker images
         run: |
           docker pull angelocapossele/drand:v1.1.4
-          docker pull gaiaadm/pumba:0.7.2
           docker pull gaiadocker/iproute2:latest
 
       - name: Run integration tests
@@ -95,7 +94,6 @@ jobs:
       - name: Pull additional Docker images
         run: |
           docker pull angelocapossele/drand:v1.1.4
-          docker pull gaiaadm/pumba:0.7.2
           docker pull gaiadocker/iproute2:latest
 
       - name: Run integration tests
@@ -130,7 +128,6 @@ jobs:
       - name: Pull additional Docker images
         run: |
           docker pull angelocapossele/drand:v1.1.4
-          docker pull gaiaadm/pumba:0.7.2
           docker pull gaiadocker/iproute2:latest
 
       - name: Run integration tests
@@ -165,7 +162,6 @@ jobs:
       - name: Pull additional Docker images
         run: |
           docker pull angelocapossele/drand:v1.1.4
-          docker pull gaiaadm/pumba:0.7.2
           docker pull gaiadocker/iproute2:latest
 
       - name: Run integration tests
@@ -199,7 +195,6 @@ jobs:
       - name: Pull additional Docker images
         run: |
           docker pull angelocapossele/drand:v1.1.4
-          docker pull gaiaadm/pumba:0.7.2
           docker pull gaiadocker/iproute2:latest
 
       - name: Run integration tests
@@ -233,7 +228,6 @@ jobs:
       - name: Pull additional Docker images
         run: |
           docker pull angelocapossele/drand:1.1.3
-          docker pull gaiaadm/pumba:latest
           docker pull gaiadocker/iproute2:latest
 
       - name: Run integration tests