diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3b5cb3930..8c54d393e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,12 +22,15 @@ concurrency:
 
 # Environment variables shared across all jobs.
 env:
+  GOPROXY: https://proxy.golang.org,direct
   GO_COMMON_TEST_ARGS: "-v github.com/jfrog/jfrog-cli-security --race --timeout 40m --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }}"
   GRADLE_OPTS: -Dorg.gradle.daemon=false
   CI: true
   JFROG_CLI_LOG_LEVEL: DEBUG
   JFROG_SECURITY_CLI_TESTS_JFROG_PLATFORM_PROJECT_KEY: ${{ vars.JFROG_TEST_PROJECT_KEY }}
-
+  # Repository variable ENABLE_FASTCI_BOOST (default: true). Set to 'false' to skip jfrog/boost@v0.
+  ENABLE_FASTCI_BOOST: ${{ vars.ENABLE_FASTCI_BOOST != 'false' }}
+  
 jobs:
   Pretest:
     if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
@@ -45,6 +48,7 @@ jobs:
           labels: "safe to test"
           
       - name: Start FastCI Optimization
+        if: env.ENABLE_FASTCI_BOOST == 'true'
         uses: jfrog/boost@v0
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
@@ -73,6 +77,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Start FastCI Optimization
+        if: env.ENABLE_FASTCI_BOOST == 'true'
         uses: jfrog/boost@v0
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
@@ -124,6 +129,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Start FastCI Optimization
+        if: env.ENABLE_FASTCI_BOOST == 'true'
         uses: jfrog/boost@v0
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
@@ -153,6 +159,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Start FastCI Optimization
+        if: env.ENABLE_FASTCI_BOOST == 'true'
         uses: jfrog/boost@v0
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
@@ -179,6 +186,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Start FastCI Optimization
+        if: env.ENABLE_FASTCI_BOOST == 'true'
         uses: jfrog/boost@v0
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
@@ -204,6 +212,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Start FastCI Optimization
+        if: env.ENABLE_FASTCI_BOOST == 'true'
         uses: jfrog/boost@v0
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
@@ -230,6 +239,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Start FastCI Optimization
+        if: env.ENABLE_FASTCI_BOOST == 'true'
         uses: jfrog/boost@v0
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
@@ -257,6 +267,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Start FastCI Optimization
+        if: env.ENABLE_FASTCI_BOOST == 'true'
         uses: jfrog/boost@v0
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
@@ -284,6 +295,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Start FastCI Optimization
+        if: env.ENABLE_FASTCI_BOOST == 'true'
         uses: jfrog/boost@v0
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
@@ -311,6 +323,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Start FastCI Optimization
+        if: env.ENABLE_FASTCI_BOOST == 'true'
         uses: jfrog/boost@v0
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
diff --git a/go.mod b/go.mod
index 7b6b87103..737967f9b 100644
--- a/go.mod
+++ b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/jfrog/jfrog-apps-config v1.0.1
 	github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260603105750-3886c0f01286
 	github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260601130310-8d52a530da18
-	github.com/jfrog/jfrog-client-go v1.55.1-0.20260528115006-6ca9682a3255
+	github.com/jfrog/jfrog-client-go v1.55.1-0.20260603130552-af1dd449b994
 	github.com/magiconair/properties v1.8.10
 	github.com/owenrumney/go-sarif/v3 v3.2.3
 	github.com/package-url/packageurl-go v0.1.3
diff --git a/go.sum b/go.sum
index 936322b73..999030550 100644
--- a/go.sum
+++ b/go.sum
@@ -173,8 +173,8 @@ github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260603105750-3886c0f01286 h1:I
 github.com/jfrog/jfrog-cli-artifactory v0.8.1-0.20260603105750-3886c0f01286/go.mod h1:GQEGVW3wT1XPykXNsEiPQrF8/+01JvDVcGGYb5vqJuE=
 github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260601130310-8d52a530da18 h1:tPv7XscDFAZaijVwMQNb+HmuucUMYQdjuA5frdGzhF0=
 github.com/jfrog/jfrog-cli-core/v2 v2.60.1-0.20260601130310-8d52a530da18/go.mod h1:9R90mhbczGXwW5EGlDs7F08ejQU/xdoDhYHMvzBiqgE=
-github.com/jfrog/jfrog-client-go v1.55.1-0.20260528115006-6ca9682a3255 h1:CIOMO1Hj5N6PaIu7sJZ9bPowcibkcaWDulM2R6LHO9o=
-github.com/jfrog/jfrog-client-go v1.55.1-0.20260528115006-6ca9682a3255/go.mod h1:FHpjN1nTDoj96xd6obe27EOgGErqzU0rQgC96L3Ch9E=
+github.com/jfrog/jfrog-client-go v1.55.1-0.20260603130552-af1dd449b994 h1:z1/WjItD4X9z1VkYhzrnbd0NWXp6+0I/LoP7XmsHl4U=
+github.com/jfrog/jfrog-client-go v1.55.1-0.20260603130552-af1dd449b994/go.mod h1:FHpjN1nTDoj96xd6obe27EOgGErqzU0rQgC96L3Ch9E=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
 github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
 github.com/kevinburke/ssh_config v1.6.0 h1:J1FBfmuVosPHf5GRdltRLhPJtJpTlMdKTBjRgTaQBFY=