diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml
index 31ac1f6..294d41c 100644
--- a/.github/workflows/buildx.yml
+++ b/.github/workflows/buildx.yml
@@ -71,7 +71,7 @@ jobs:
         run: echo ${{ steps.buildx.outputs.platforms }}
 
       - name: Docker Buildx (build)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.1.0
         if: success() && !contains(github.ref, 'master')
         with:
           push: false
@@ -89,7 +89,7 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Docker Buildx (push)
-        uses: docker/build-push-action@v3.0.0
+        uses: docker/build-push-action@v3.1.0
         if: success() && contains(github.ref, 'master')
         with:
           push: true
diff --git a/1.16-3.13/Dockerfile b/1.16-3.13/Dockerfile
index bc25b6f..3630e43 100644
--- a/1.16-3.13/Dockerfile
+++ b/1.16-3.13/Dockerfile
@@ -1,4 +1,5 @@
 FROM golang:1.16-alpine3.13
+WORKDIR /
 RUN apk add --no-cache bash make git gcc libc-dev jq curl dumb-init
 RUN cd /tmp && \
     git clone https://github.com/go-delve/delve && \
diff --git a/1.16/Dockerfile b/1.16/Dockerfile
index fa96624..aa4d3da 100644
--- a/1.16/Dockerfile
+++ b/1.16/Dockerfile
@@ -1,4 +1,5 @@
 FROM golang:1.16-alpine
+WORKDIR /
 RUN apk add --no-cache bash make git gcc libc-dev jq curl dumb-init
 RUN cd /tmp && \
     git clone https://github.com/go-delve/delve && \
diff --git a/1.17-3.13/Dockerfile b/1.17-3.13/Dockerfile
index 5843e43..acc7f57 100644
--- a/1.17-3.13/Dockerfile
+++ b/1.17-3.13/Dockerfile
@@ -1,4 +1,5 @@
 FROM golang:1.17-alpine3.13
+WORKDIR /
 RUN apk add --no-cache bash make git gcc libc-dev jq curl dumb-init
 RUN cd /tmp && \
     git clone https://github.com/go-delve/delve && \
diff --git a/1.17/Dockerfile b/1.17/Dockerfile
index 95eeda8..01edb26 100644
--- a/1.17/Dockerfile
+++ b/1.17/Dockerfile
@@ -1,4 +1,5 @@
 FROM golang:1.17-alpine
+WORKDIR /
 RUN apk add --no-cache bash make git gcc libc-dev jq curl dumb-init
 RUN cd /tmp && \
     git clone https://github.com/go-delve/delve && \
diff --git a/1.18/Dockerfile b/1.18/Dockerfile
index c8eedc3..a02edd6 100644
--- a/1.18/Dockerfile
+++ b/1.18/Dockerfile
@@ -1,4 +1,5 @@
 FROM golang:1.18-alpine
+WORKDIR /
 RUN apk add --no-cache bash make git gcc libc-dev jq curl dumb-init
 RUN cd /tmp && \
     git clone https://github.com/go-delve/delve && \