diff --git a/.github/workflows/lifecycleTests.yml b/.github/workflows/lifecycleTests.yml
index 955dfd7ce..e9b66c767 100644
--- a/.github/workflows/lifecycleTests.yml
+++ b/.github/workflows/lifecycleTests.yml
@@ -18,21 +18,57 @@ concurrency:
   cancel-in-progress: true
 jobs:
   Lifecycle-Tests:
-    name: Lifecycle tests (${{ matrix.os }})
+    name: Lifecycle tests (${{ matrix.os.name }})
     if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'safe to test')
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, windows, macos]
-    runs-on: ${{ matrix.os }}-latest
+        os:
+          - name: ubuntu
+            version: 24.04
+          - name: windows
+            version: 2022
+          - name: macos
+            version: 14
+    runs-on: ${{ matrix.os.name }}-${{ matrix.os.version }}
     steps:
+      - name: Skip macOS - JGC-413
+        if: matrix.os.name == 'macos'
+        run: |
+          echo "::warning::JGC-413 - Skip until artifactory bootstrap in osx is fixed"
+          exit 0
+
       - name: Checkout code
+        if: matrix.os.name != 'macos'
         uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
       - name: Setup Go with cache
+        if: matrix.os.name != 'macos'
         uses: jfrog/.github/actions/install-go-with-cache@main
 
+      - name: Debug macOS Environment and Set Timeout
+        if: runner.os == 'macOS'
+        run: |
+          echo "=== macOS Debug Information ==="
+          echo "Architecture: $(uname -m)"
+          echo "macOS Version: $(sw_vers -productVersion)"
+          echo "macOS Build: $(sw_vers -buildVersion)"
+          echo "Available memory: $(system_profiler SPHardwareDataType | grep Memory || echo 'Memory info not available')"
+          echo "Available disk space: $(df -h)"
+          echo "Java version: $(java -version 2>&1 || echo 'Java not found')"
+          echo "Go version: $(go version)"
+          echo "Setting RT_CONNECTION_TIMEOUT_SECONDS to 2400 for macOS"
+          echo "RT_CONNECTION_TIMEOUT_SECONDS=2400" >> $GITHUB_ENV
+
+      - name: Install local Artifactory
+        if: matrix.os.name != 'macos'
+        uses: jfrog/.github/actions/install-local-artifactory@main
+        with:
+          RTLIC: ${{ secrets.RTLIC }}
+          RT_CONNECTION_TIMEOUT_SECONDS: ${{ env.RT_CONNECTION_TIMEOUT_SECONDS || '1200' }}
+
       - name: Run Lifecycle tests
-        run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.lifecycle --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-lifecycle
+        if: matrix.os.name != 'macos'
+        run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.lifecycle --jfrog.url=http://127.0.0.1:8082 --jfrog.adminToken=${{ env.JFROG_TESTS_LOCAL_ACCESS_TOKEN }} --ci.runId=${{ runner.os }}-lifecycle
diff --git a/artifactory_test.go b/artifactory_test.go
index 8be891ecf..7f87e7586 100644
--- a/artifactory_test.go
+++ b/artifactory_test.go
@@ -6492,7 +6492,7 @@ func deleteProjectIfExists(t *testing.T, accessManager *access.AccessServicesMan
 	err := accessManager.DeleteProject(projectKey)
 	if err != nil {
 		if !strings.Contains(err.Error(), "Could not find project") {
-			t.Error(t, err)
+			t.Error(err)
 		}
 	}
 }