diff --git a/.github/draft-release-notes-config.yml b/.github/draft-release-notes-config.yml
index 371f1b065e..34b199cbf7 100644
--- a/.github/draft-release-notes-config.yml
+++ b/.github/draft-release-notes-config.yml
@@ -16,30 +16,23 @@ replacers:
 categories:
   - title: 'Breaking Changes'
     labels:
-      - 'Breaking Changes'
+      - 'breaking'
   - title: 'Features'
     labels:
       - 'feature'
-  - title: 'Enhancements'
-    labels:
       - 'enhancement'
   - title: 'Bug Fixes'
     labels:
       - 'bug'
   - title: 'Infrastructure'
     labels:
-      - 'infra'
-      - 'test'
-      - 'dependencies'
-      - 'github actions'
+      - 'infrastructure'
+      - 'testing'
+      - 'integ-test-failure'
+      - 'repository'
   - title: 'Documentation'
     labels:
       - 'documentation'
   - title: 'Maintenance'
     labels:
-      - "version compatibility"
       - "maintenance"
-  - title: 'Refactoring'
-    labels:
-      - 'refactor'
-      - 'code quality'
diff --git a/.github/workflows/enforce-labels.yml b/.github/workflows/enforce-labels.yml
new file mode 100644
index 0000000000..71d923f66d
--- /dev/null
+++ b/.github/workflows/enforce-labels.yml
@@ -0,0 +1,13 @@
+name: Enforce PR labels
+
+on:
+  pull_request:
+    types: [labeled, unlabeled, opened, edited, synchronize]
+jobs:
+  enforce-label:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: yogevbd/enforce-label-action@2.1.0
+      with:
+        REQUIRED_LABELS_ANY: "breaking,feature,enhancement,bug,infrastructure,dependencies,documentation,maintenance,skip-changelog"
+        REQUIRED_LABELS_ANY_DESCRIPTION: "A release label is required: ['breaking', 'bug', 'dependencies', 'documentation', 'enhancement', 'feature', 'infrastructure', 'maintenance', 'skip-changelog']"