diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 3608df17..f599bacd 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -1,11 +1,11 @@
-name: Release Drafter
+name: Release Drafter and Labels
 
 on:
   push:
     branches:
       - main
-  # pull_request:
-  #   types: [opened, reopened, synchronize]
+  pull_request:
+    types: [edited, opened, reopened, synchronize, unlabeled, labeled]
 
 permissions:
   contents: read
@@ -13,23 +13,25 @@ permissions:
 jobs:
   update_release_draft:
     permissions:
-      # write permission is required to create a github release
       contents: write
-      # write permission is required for autolabeler
-      # otherwise, read permission is required at least
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      # (Optional) GitHub Enterprise requires GHE_HOST variable set
-      #- name: Set GHE_HOST
-      #  run: |
-      #    echo "GHE_HOST=${GITHUB_SERVER_URL##https:\/\/}" >> $GITHUB_ENV
-
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - uses: release-drafter/release-drafter@v6
-        # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
-        # with:
-        #   config-name: my-config.yml
-        #   disable-autolabeler: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  require_label:
+    if: github.event.pull_request
+    needs: update_release_draft
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: mheap/github-action-required-labels@v5
+        with:
+          mode: minimum
+          count: 1
+          labels: "breaking, bug, github_actions, documentation, dependencies, enhancement, feature, maintenance, security"
+          add_comment: true
diff --git a/.github/workflows/require-labels.yml b/.github/workflows/require-labels.yml
deleted file mode 100644
index 4df124dd..00000000
--- a/.github/workflows/require-labels.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Pull Request Labels
-on:
-  pull_request:
-    types: [opened, labeled, unlabeled, synchronize]
-jobs:
-  label:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - uses: mheap/github-action-required-labels@v5
-        with:
-          mode: minimum
-          count: 1
-          labels: "breaking, bug, github_actions, documentation, dependencies, enhancement, feature, maintenance, security"
-          add_comment: true