diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 5f4583ea..b94bf243 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -91,8 +91,6 @@ jobs:
           echo "docker_image=${DOCKER_IMAGE}" >> $GITHUB_OUTPUT
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-        with:
-          platforms: all
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
@@ -101,13 +99,6 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
       - name: Build
         uses: docker/build-push-action@v6
         with:
@@ -116,15 +107,8 @@ jobs:
           build-args: INSTALL_DEV=true
           push: true
           tags: ${{ steps.prep.outputs.tags }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-      # 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
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       # Uploading the README.md is not a core feature of docker/build-push-action yet
       - name: Update README
diff --git a/Dockerfile b/Dockerfile
index f0eb149d..6043dfed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -41,7 +41,7 @@ COPY LICENSE README.md rosys.code-workspace ./
 ADD ./rosys /rosys/rosys
 RUN poetry install -vvv
 
-ENV PYTHONPATH "/rosys"
+ENV PYTHONPATH="/rosys"
 
 EXPOSE 8080
 
@@ -49,4 +49,4 @@ WORKDIR /app/
 COPY ./start.sh /
 COPY ./main.py /app/
 
-CMD /start.sh
+CMD ["/start.sh"]