diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 00000000000..3e73ca963c3
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,28 @@
+version: 1
+labels:
+  - label: "platform"
+    files:
+      - "openbb_platform/.*"
+
+  - label: "v4"
+    files:
+      - "openbb_platform/.*"
+
+  - label: "bug"
+    branch: "^hotfix/.*"
+    files:
+      - "openbb_platform/.*"
+
+  - label: "platform"
+    branch: "^hotfix/.*"
+    files:
+      - "openbb_platform/.*"
+
+  - label: "enhancement"
+    branch: "^feature/.*"
+
+  - label: "bug"
+    branch: "^hotfix/.*"
+
+  - label: "docs"
+    branch: "^docs/.*"
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 0a776008049..9643fdf332c 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -1,5 +1,13 @@
 name-template: 'OpenBB Terminal v$NEXT_MINOR_VERSION'
 tag-template: 'v$NEXT_MINOR_VERSION'
+categories:
+  - title: 🦋 OpenBB Platform Enhancements
+    labels: 
+      - 'platform'
+      - 'v4'
+  - title: 🐛 OpenBB Platform Bug Fixes
+    labels: 
+      - 'bug'
 exclude-contributors:
   - 'jmaslek'
   - 'DidierRLopes'
@@ -25,7 +33,7 @@ template: |
   $CHANGES
 
   We are proud of our community contributors and staunch supporters of open-source ecosystems.
-  Help us promote our community by tagging `@openbb_finance` on Twitter with a link to your pull request,
+  Help us promote our community by tagging `@openbb_finance` on X with a link to your pull request,
   and join our Discord server to chat about your contribution! We want to hear about your experience!
 
   ### Links 🦋
diff --git a/.github/workflows/labels-PR.yml b/.github/workflows/labels-PR.yml
index fa84744e432..259632be888 100644
--- a/.github/workflows/labels-PR.yml
+++ b/.github/workflows/labels-PR.yml
@@ -1,18 +1,25 @@
 name: Pull Request Labels
-"on":
+
+on:
   pull_request:
     types: [opened, reopened, labeled, unlabeled, synchronize]
+
 jobs:
   label:
     runs-on: ubuntu-latest
     steps:
-      - uses: mheap/github-action-required-labels@v1
-        with:
-          mode: minimum
-          count: 1
-          labels: "guides, bug, build, docker, docs, feat XS, feat S, feat M, feat L, feat XL, help wanted, refactor, tests, dependencies, release"
+      # - uses: mheap/github-action-required-labels@v1
+      #   with:
+      #     mode: minimum
+      #     count: 1
+      #     labels: "guides, bug, build, docker, docs, feat XS, feat S, feat M, feat L, feat XL, help wanted, refactor, tests, dependencies, release"
       - uses: mheap/github-action-required-labels@v1
         with:
           mode: exactly
           count: 0
           labels: "do not merge"
+      
+      - name: Label OpenBB Platform PRs
+        uses: srvaroa/labeler@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file