diff --git a/.github/workflows/dockerTests.yml b/.github/workflows/dockerTests.yml
index 28ff6a34d..af8639178 100644
--- a/.github/workflows/dockerTests.yml
+++ b/.github/workflows/dockerTests.yml
@@ -30,6 +30,18 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
+      - name: Configure Docker 29 for Legacy Support
+        run: |
+          sudo bash -c 'cat <<EOF > /etc/docker/daemon.json
+          {
+            "insecure-registries": ["localhost:8082"],
+            "features": {
+              "containerd-snapshotter": false
+            }
+          }
+          EOF'
+          sudo systemctl restart docker
+
       - name: Setup FastCI
         uses: jfrog-fastci/fastci@v0
         with:
@@ -48,13 +60,9 @@ jobs:
           RTLIC: ${{secrets.RTLIC}}
           GOPROXY: direct
 
-      - name: Wait for Artifactory to finish loading
-        uses: nev7n/wait_for_response@v1
-        with:
-          url: "http://localhost:8082"
-          responseCode: 200
-          timeout: 600000
-          interval: 500
+      - name: Wait for Artifactory (Native)
+        run: |
+          timeout 600s bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8082)" != "200" ]]; do sleep 5; done'
 
       - name: Run Docker tests
         run: go test -v -timeout 0 --test.docker
diff --git a/.github/workflows/podmanTests.yml b/.github/workflows/podmanTests.yml
index c51148ba4..4d86f33fd 100644
--- a/.github/workflows/podmanTests.yml
+++ b/.github/workflows/podmanTests.yml
@@ -30,6 +30,18 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
+      - name: Configure Docker 29 for Legacy Support
+        run: |
+          sudo bash -c 'cat <<EOF > /etc/docker/daemon.json
+          {
+            "insecure-registries": ["localhost:8082"],
+            "features": {
+              "containerd-snapshotter": false
+            }
+          }
+          EOF'
+          sudo systemctl restart docker
+
       - name: Setup FastCI
         uses: jfrog-fastci/fastci@v0
         with:
@@ -40,4 +52,4 @@ jobs:
         uses: jfrog/.github/actions/install-go-with-cache@main
 
       - name: Run podman tests
-        run: go test -v -timeout 0 --test.podman --jfrog.url=${{ secrets.EPLUS_PLATFORM_URL }} --jfrog.adminToken=${{ secrets.EPLUS_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }}
\ No newline at end of file
+        run: go test -v -timeout 0 --test.podman --jfrog.url=${{ secrets.EPLUS_PLATFORM_URL }} --jfrog.adminToken=${{ secrets.EPLUS_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }}