diff --git a/.github/workflows/bump-azure.yml b/.github/workflows/bump-azure.yml
deleted file mode 100644
index bdbcb209c..000000000
--- a/.github/workflows/bump-azure.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: bump-azure
-
-# yamllint disable-line rule:truthy
-on:
-  push:
-    tags:
-      - '*'
-jobs:
-  bump-azure:
-    runs-on: macos-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Get version
-        id: get_version
-        run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
-      - name: Bump Azure Template
-        env:
-          BOT_GITHUB_USERNAME: ${{ secrets.HOMEBREW_GITHUB_USERNAME }}
-          BOT_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
-        run: |
-          VERSION=${{ steps.get_version.outputs.version }}
-          git config --global user.name 'Dokku Bot'
-          git config --global user.email no-reply@dokku.com
-          .github/commands/bump-azure "${VERSION:1}" "$BOT_GITHUB_USERNAME" "$BOT_GITHUB_API_TOKEN"
diff --git a/.github/workflows/bump-formula.yml b/.github/workflows/bump-formula.yml
deleted file mode 100644
index c3e2e5cea..000000000
--- a/.github/workflows/bump-formula.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: bump-formula
-
-# yamllint disable-line rule:truthy
-on:
-  push:
-    tags:
-      - '*'
-jobs:
-  bump-formula:
-    runs-on: macos-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-      - name: Get version
-        id: get_version
-        run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
-      - name: Bump Brew
-        env:
-          HOMEBREW_GITHUB_USERNAME: ${{ secrets.HOMEBREW_GITHUB_USERNAME }}
-          HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
-        run: |
-          git config --global user.name 'Dokku Bot'
-          git config --global user.email no-reply@dokku.com
-          brew tap dokku/repo "https://$HOMEBREW_GITHUB_USERNAME:$HOMEBREW_GITHUB_API_TOKEN@github.com/dokku/homebrew-repo.git"
-          brew bump-formula-pr -f --no-browse --no-audit --no-fork --url "https://github.com/dokku/dokku/archive/${{ steps.get_version.outputs.version }}.tar.gz" dokku/repo/dokku
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 896a8ef6d..347be2b49 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,6 +16,8 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
+    outputs:
+      version: ${{ steps.version.outputs.version }}
     steps:
       - uses: actions/checkout@v2
         with:
@@ -42,8 +44,42 @@ jobs:
       - name: build package
         run: contrib/release-dokku ${{ github.event.inputs.release_type }}
 
+      - name: output version
+        id: version
+        run: echo "::set-output name=version::$(cat build/next-version)"
+
       - name: upload packages
         uses: actions/upload-artifact@v2
         with:
           name: build
           path: build
+
+  bump-azure:
+    name: bump-azure
+    runs-on: ubuntu-20.04
+    needs: release
+    steps:
+      - name: Bump Azure Template
+        env:
+          BOT_GITHUB_USERNAME: ${{ secrets.HOMEBREW_GITHUB_USERNAME }}
+          BOT_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
+        run: |
+          VERSION=${{ needs.release.outputs.version }}
+          git config --global user.name 'Dokku Bot'
+          git config --global user.email no-reply@dokku.com
+          .github/commands/bump-azure "${VERSION:1}" "$BOT_GITHUB_USERNAME" "$BOT_GITHUB_API_TOKEN"
+
+  bump-formula:
+    name: bump-formula
+    runs-on: macos-latest
+    needs: release
+    steps:
+      - name: Bump Homebrew Formula
+        env:
+          HOMEBREW_GITHUB_USERNAME: ${{ secrets.HOMEBREW_GITHUB_USERNAME }}
+          HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_GITHUB_API_TOKEN }}
+        run: |
+          git config --global user.name 'Dokku Bot'
+          git config --global user.email no-reply@dokku.com
+          brew tap dokku/repo "https://$HOMEBREW_GITHUB_USERNAME:$HOMEBREW_GITHUB_API_TOKEN@github.com/dokku/homebrew-repo.git"
+          brew bump-formula-pr -f --no-browse --no-audit --no-fork --url "https://github.com/dokku/dokku/archive/${{ needs.release.outputs.version }}.tar.gz" dokku/repo/dokku
diff --git a/contrib/release-dokku b/contrib/release-dokku
index 50d261086..ca7b8bcfc 100755
--- a/contrib/release-dokku
+++ b/contrib/release-dokku
@@ -376,6 +376,8 @@ main() {
   NEXT_VERSION="$(fn-version-next "$CURRENT_VERSION" "$RELEASE")"
   IS_RELEASE="$(fn-is-release "$RELEASE")"
 
+  echo "v${NEXT_VERSION}" >build/next-version
+
   fn-repo-update "$IS_RELEASE" "$CURRENT_VERSION" "$NEXT_VERSION"
   fn-build-dokku "$IS_RELEASE" "$NEXT_VERSION" || log-fail "Error building package"
   fn-extract-package "$IS_RELEASE" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package"