diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index ae335b43c..83a7a8b80 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -8,14 +8,10 @@ on:
         required: false
         default: ''
         type: string
-      release-version-specified:
-        type: boolean
-        description: 'Use release version instead of bumping version from version tag'
-        default: false
-      first-release-version:
-        description: 'Version number to use if this is the first release'
+      release-version:
+        description: 'Version number to use. If provided bump-rule will be ignored'
         required: false
-        default: 0.1.0rc0
+        default: ''
         type: string
       bump-rule:
         description: 'Bump rule for computing next release version number.'
@@ -30,6 +26,17 @@ on:
           - preminor
           - premajor
           - prerelease
+      run-tests-wait:
+        description: 'Wait time to run test after merge to main'
+        required: false
+        default: 600
+        type: number
+      publish-to-test-pypi:
+        description: 'Set to true if you want to publish to https://test.pypi.org/legacy/ instead of pypi.org'
+        required: false
+        default: false
+        type: boolean
+      
 
 defaults:
   run:
@@ -46,12 +53,11 @@ jobs:
       contents: write  # To push a branch
       pull-requests: write  # To create a PR from that branch
 
-    uses: craig8/github-tooling/.github/workflows/deploy-release.yml@repurpose-first-release-version
+    uses: eclipse-volttron/github-tooling/.github/workflows/deploy-release.yml@main
     with:
       merge-strategy: ${{ inputs.merge-strategy }}
-      first-release-version: ${{ inputs.first-release-version }}
+      release-version: ${{ inputs.release-version }}
       bump-rule: ${{ inputs.bump-rule }}
-      release-version-specified: ${{ inputs.release-version-specified }}
       run-tests-wait: 600
       publish-to-test-pypi: false
     secrets: