diff --git a/.github/actions/get-artifact-for-stage-tests/action.yml b/.github/actions/get-artifact-for-stage-tests/action.yml
index feae95bd34..1df20575e7 100644
--- a/.github/actions/get-artifact-for-stage-tests/action.yml
+++ b/.github/actions/get-artifact-for-stage-tests/action.yml
@@ -74,7 +74,6 @@ runs:
     if: ${{ inputs.get_from_jfrog == 'true' }}
     env:
       JF_URL: ${{ inputs.JFROG_PLATFORM_URL }}
-      JF_ACCESS_TOKEN: ${{ inputs.JFROG_ACCESS_TOKEN }}
 
   - name: Download artifact from JFrog
     if: ${{ inputs.get_from_jfrog == 'true' }}
diff --git a/.github/workflows/dev-workflow-p2.yml b/.github/workflows/dev-workflow-p2.yml
index 7427ec970e..f358506511 100644
--- a/.github/workflows/dev-workflow-p2.yml
+++ b/.github/workflows/dev-workflow-p2.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   bump-dev-number:
-    if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
+    if: ${{ false && github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
     uses: ./.github/workflows/bump-version.yml
     with:
       change: 'bump-dev-num'
@@ -28,16 +28,18 @@ jobs:
 
   upload-to-jfrog:
     name: Upload artifacts to JFrog
-    needs: [
-      bump-dev-number,
-      rebuild-artifacts-with-new-dev-num
-    ]
+    # needs: [
+    #   bump-dev-number,
+    #   rebuild-artifacts-with-new-dev-num
+    # ]
     uses: ./.github/workflows/upload-to-jfrog.yml
     with:
-      version: ${{ needs.bump-dev-number.outputs.new_version }}
+      version: a
+      # version: ${{ needs.bump-dev-number.outputs.new_version }}
     secrets: inherit
 
   # We don't want the artifacts in JFrog to also exist in Github
   delete-artifacts:
+    if: ${{ false }}
     needs: upload-to-jfrog
     uses: ./.github/workflows/delete-artifacts.yml
diff --git a/.github/workflows/upload-jfrog-build-to-pypi.yml b/.github/workflows/upload-jfrog-build-to-pypi.yml
index 02a5f56bf8..fdf1ab7eb7 100644
--- a/.github/workflows/upload-jfrog-build-to-pypi.yml
+++ b/.github/workflows/upload-jfrog-build-to-pypi.yml
@@ -19,7 +19,6 @@ jobs:
     - uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: ${{ secrets.JFROG_PLATFORM_URL }}
-        JF_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }}
 
     - name: Download JFrog build
       run: jf rt dl --build python-client/${{ inputs.version }} ${{ vars.JFROG_REPO_NAME }}
diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml
index 04c31a2f3c..45721e590d 100644
--- a/.github/workflows/upload-to-jfrog.yml
+++ b/.github/workflows/upload-to-jfrog.yml
@@ -18,6 +18,9 @@ on:
 
 jobs:
   upload-to-jfrog:
+    permissions:
+        id-token: write
+
     name: Upload artifacts to JFrog
     runs-on: ubuntu-22.04
     steps:
@@ -29,24 +32,26 @@ jobs:
         path: artifacts
 
     - name: Set up JFrog credentials
-      uses: jfrog/setup-jfrog-cli@v3
+      uses: jfrog/setup-jfrog-cli@v4
       env:
-        JF_URL: ${{ secrets.JFROG_PLATFORM_URL }}
-        JF_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }}
+        JF_URL: https://artifact.aerospike.io
+      with:
+        oidc-provider-name: gh-dev-test
+        oidc-audience: aerospike/testing
 
-    - name: Upload manylinux builds from arbitrary branches to JFrog generic repo
-      if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }}
-      run: jf rt upload "*manylinux*" ${{ vars.JFROG_GENERIC_REPO_NAME }}/${{ github.ref_name }}/
-      working-directory: artifacts
+    # - name: Upload manylinux builds from arbitrary branches to JFrog generic repo
+    #   if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }}
+    #   run: jf rt upload "*manylinux*" ${{ vars.JFROG_GENERIC_REPO_NAME }}/${{ github.ref_name }}/
+    #   working-directory: artifacts
 
-    - name: Upload passing builds to JFrog PyPI repo
-      if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }}
-    # Source path must be in quotes if it contains an asterisk
-      # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551
-      run: jf rt upload --build-name python-client --build-number $NEW_VERSION "artifacts/*" ${{ vars.JFROG_REPO_NAME }}/aerospike/$NEW_VERSION/
-      env:
-        NEW_VERSION: ${{ inputs.version }}
+    # - name: Upload passing builds to JFrog PyPI repo
+    #   if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }}
+    # # Source path must be in quotes if it contains an asterisk
+    #   # https://github.com/jfrog/jfrog-cli/issues/1775#issuecomment-1348986551
+    #   run: jf rt upload --build-name python-client --build-number $NEW_VERSION "artifacts/*" ${{ vars.JFROG_REPO_NAME }}/aerospike/$NEW_VERSION/
+    #   env:
+    #     NEW_VERSION: ${{ inputs.version }}
 
-    - name: Publish build info
-      if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }}
-      run: jf rt build-publish python-client ${{ inputs.version }}
+    # - name: Publish build info
+    #   if: ${{ inputs.jfrog-repo-name == vars.JFROG_REPO_NAME }}
+    #   run: jf rt build-publish python-client ${{ inputs.version }}
diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
index 44c390a7a5..bb3f6d882d 100644
--- a/.github/workflows/valgrind.yml
+++ b/.github/workflows/valgrind.yml
@@ -44,7 +44,6 @@ jobs:
     - uses: jfrog/setup-jfrog-cli@v4
       env:
         JF_URL: ${{ secrets.JFROG_PLATFORM_URL }}
-        JF_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }}
 
     - name: Get shortened commit hash of this workflow run
       # versioningit commit sha is always 8 chars long it seems