diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1e30d37a60..bea52c56a5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,6 +1,7 @@
 name: Builds
 
 on:
+  workflow_dispatch:
   release:
     types: [created]
   push:
diff --git a/.github/workflows/caching.yml b/.github/workflows/caching.yml
index 4848e819bd..bc01550654 100644
--- a/.github/workflows/caching.yml
+++ b/.github/workflows/caching.yml
@@ -27,6 +27,7 @@ concurrency:
   cancel-in-progress: true
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
@@ -52,19 +53,12 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
-      should_skip_ghcide: ${{ steps.skip_ghcide_check.outputs.should_skip }}
     steps:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@v3.4.1
         with:
           cancel_others: false
           paths_ignore: '["**/docs/**", "**.md", "**/LICENSE", "install/**", "**.nix", "flake.lock", "**/README.md", "FUNDING.yml", ".circleci/**"]'
-      # If we only change ghcide downstream packages we have not test ghcide itself
-      - id: skip_ghcide_check
-        uses: fkirc/skip-duplicate-actions@v3.4.1
-        with:
-          cancel_others: false
-          paths_ignore: '["hls-test-utils/**", "plugins/**", "src/**", "exe/**", "test/**", "shake-bench/**"]'
 
   caching:
     if: needs.pre_job.outputs.should_skip != 'true'
diff --git a/.github/workflows/hackage.yml b/.github/workflows/hackage.yml
index c5b8e1a890..7fa7714afd 100644
--- a/.github/workflows/hackage.yml
+++ b/.github/workflows/hackage.yml
@@ -6,6 +6,12 @@ concurrency:
   cancel-in-progress: true
 
 on:
+  workflow_dispatch:
+    inputs:
+      upload-candidates:
+        description: 'Whether packages should be uploaded'
+        required: true
+        default: 'true'
   push:
     branches:
       - '*-hackage'
@@ -14,7 +20,7 @@ jobs:
   check-and-upload-tarballs:
     runs-on: ubuntu-latest
     strategy:
-      fail-fast: ${{ !contains(github.ref_name, 'check') }}
+      fail-fast: ${{ !contains(github.ref_name, 'check') && github.event.inputs.upload-candidates != 'true' }}
       matrix:
         package: ["hie-compat", "hls-graph", "shake-bench",
                   "hls-plugin-api", "ghcide", "hls-test-utils",
@@ -28,7 +34,6 @@ jobs:
                   "hls-call-hierarchy-plugin", "hls-alternate-number-format-plugin",
                   "hls-qualify-imported-names-plugin",
                   "haskell-language-server"]
-        # Uncomment 9.0.1 when ghcide is buildable
         ghc: [ "9.0.1",
               "8.10.7",
               "8.8.4",
@@ -181,7 +186,7 @@ jobs:
           path: ${{ steps.generate-dist-tarball.outputs.path }}
 
   upload-candidate:
-    if: ${{ !contains(github.ref_name, 'check') }}
+    if: ${{ !contains(github.ref_name, 'check') || github.event.inputs.name == 'true' }}
     needs: check-and-upload-tarballs
     runs-on: ubuntu-latest
     steps: