diff --git a/.github/workflows/close-featurebranch.yml b/.github/workflows/close-featurebranch.yml
index 46cb781730..5da3eb52cd 100644
--- a/.github/workflows/close-featurebranch.yml
+++ b/.github/workflows/close-featurebranch.yml
@@ -2,9 +2,7 @@ name: close-featurebranch
 
 on:
   pull_request:
-    types: [closed]
-    branches:
-      - master
+    types: [closed, unlabeled]
   workflow_dispatch:
     inputs:
       BRANCH:
@@ -14,6 +12,9 @@ on:
 
 jobs:
   release:
+    if: |
+      (github.event.action == 'closed' && contains(github.event.pull_request.labels.*.name, 'feature-branch')) ||
+       github.event.label.name == 'feature-branch'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml
index c70f2fff20..a5636fe912 100644
--- a/.github/workflows/deploy-featurebranch.yml
+++ b/.github/workflows/deploy-featurebranch.yml
@@ -2,12 +2,19 @@ name: deploy-featurebranch
 
 on:
   pull_request:
-    branches:
-      - master
+    types: [
+        labeled,
+        # default types below (https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request)
+        opened,
+        synchronize,
+        reopened,
+      ]
 
 jobs:
   release:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
+    if: |
+      (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase') &&
+      contains(github.event.pull_request.labels.*.name, 'feature-branch')
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3