diff --git a/.github/workflows/pjdfstest.yml b/.github/workflows/pjdfstest.yml
index 878f787f4f..a88d19d48a 100644
--- a/.github/workflows/pjdfstest.yml
+++ b/.github/workflows/pjdfstest.yml
@@ -41,13 +41,20 @@ jobs:
         cache: ${{ runner.environment == 'github-hosted' }}
 
     - name: Start local Docker registry
-      run: docker run -d --restart=always -p 5000:5000 --name registry registry:2
+      run: |
+        if ! docker start registry 2>/dev/null; then
+          docker rm -f registry >/dev/null 2>&1 || true
+          docker run -d --restart=always -p 5000:5000 --name registry registry:2
+        fi
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v4
       with:
         driver-opts: network=host
 
+    - name: Set up Docker Compose
+      uses: docker/setup-compose-action@v2
+
     - name: Build weed race binary
       run: |
         cd docker
diff --git a/.github/workflows/samba-integration.yml b/.github/workflows/samba-integration.yml
index f37020090a..94b9d670d3 100644
--- a/.github/workflows/samba-integration.yml
+++ b/.github/workflows/samba-integration.yml
@@ -43,13 +43,20 @@ jobs:
         cache: ${{ runner.environment == 'github-hosted' }}
 
     - name: Start local Docker registry
-      run: docker run -d --restart=always -p 5000:5000 --name registry registry:2
+      run: |
+        if ! docker start registry 2>/dev/null; then
+          docker rm -f registry >/dev/null 2>&1 || true
+          docker run -d --restart=always -p 5000:5000 --name registry registry:2
+        fi
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v4
       with:
         driver-opts: network=host
 
+    - name: Set up Docker Compose
+      uses: docker/setup-compose-action@v2
+
     - name: Build weed race binary
       run: |
         cd docker