diff --git a/.github/workflows/upload-to-jfrog.yml b/.github/workflows/upload-to-jfrog.yml
index 9d5c2cec6..3b7dae776 100644
--- a/.github/workflows/upload-to-jfrog.yml
+++ b/.github/workflows/upload-to-jfrog.yml
@@ -5,7 +5,7 @@ on:
     inputs:
       version:
         type: string
-        required: true
+        required: false
       jfrog-repo-name:
         type: string
         required: false
@@ -33,12 +33,18 @@ jobs:
         JF_URL: ${{ secrets.JFROG_PLATFORM_URL }}
         JF_ACCESS_TOKEN: ${{ secrets.JFROG_ACCESS_TOKEN }}
 
-    - name: Upload passing builds to JFrog
-      # Source path must be in quotes if it contains an asterisk
+    - name: Upload builds from arbitrary branches to JFrog generic repo
+      if: ${{ inputs.jfrog-repo-name == vars.JFROG_GENERIC_REPO_NAME }}
+      run: jf rt upload "artifacts/*" ${{ vars.JFROG_GENERIC_REPO_NAME }}/${{ github.ref_name }}/
+
+    - 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 }}