diff --git a/.github/workflows/ci-test-go.yml b/.github/workflows/ci-test-go.yml
index 54a3a3d152..82be78435f 100644
--- a/.github/workflows/ci-test-go.yml
+++ b/.github/workflows/ci-test-go.yml
@@ -55,11 +55,9 @@ jobs:
     steps:
       - name: Setup rootless Docker
         if: ${{ inputs.rootless-docker }}
-        uses: ScribeMD/rootless-docker@6bd157a512c2fafa4e0243a8aa87d964eb890886  # v0.2.2
-
-      - name: Remove Docker root socket
-        if: ${{ inputs.rootless-docker }}
-        run: sudo rm -rf /var/run/docker.sock
+        uses: docker/setup-docker-action@01efb57f882e3b1a22e7cf3501dbe51287b0ecb4 # v4
+        with:
+          rootless: true
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
diff --git a/.github/workflows/docker-moby-latest.yml b/.github/workflows/docker-moby-latest.yml
index 957d2eb3ff..dc06fb49e7 100644
--- a/.github/workflows/docker-moby-latest.yml
+++ b/.github/workflows/docker-moby-latest.yml
@@ -38,7 +38,7 @@ jobs:
         run: go mod tidy
 
       - name: Install Nightly Docker
-        uses: crazy-max/ghaction-setup-docker@master
+        uses: docker/setup-docker-action@master
         with:
           rootless: ${{ matrix.rootless-docker }}
           version: type=image,tag=master