diff --git a/.github/ISSUE_TEMPLATE/bug_report_android.yml b/.github/ISSUE_TEMPLATE/bug_report_android.yml
index e3cd0de8d92..f76c38dbe75 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_android.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_android.yml
@@ -1,7 +1,6 @@
 name: 🐞 Bug Report - Android
 description: Tell us about something that's not working the way we (probably) intend.
-labels: ["Platform: Android", "Type: Bug"]
-type: Bug
+labels: ["Android", "Bug"]
 body:
   - type: dropdown
     id: integration
diff --git a/.github/ISSUE_TEMPLATE/bug_report_java.yml b/.github/ISSUE_TEMPLATE/bug_report_java.yml
index 3eb8a8ffa3d..c6817a5a0c8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report_java.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report_java.yml
@@ -1,7 +1,6 @@
 name: 🐞 Bug Report - Java
 description: Tell us about something that's not working the way we (probably) intend.
-labels: ["Platform: Java", "Type: Bug"]
-type: Bug
+labels: ["Java", "Bug"]
 body:
   - type: dropdown
     id: integration
diff --git a/.github/ISSUE_TEMPLATE/feature_android.yml b/.github/ISSUE_TEMPLATE/feature_android.yml
index 30a6001ed3e..d1f71024569 100644
--- a/.github/ISSUE_TEMPLATE/feature_android.yml
+++ b/.github/ISSUE_TEMPLATE/feature_android.yml
@@ -1,7 +1,6 @@
 name: 💡 Feature Request - Android
 description: Tell us about a problem our SDK could solve but doesn't.
-labels: ["Platform: Android", "Type: Feature Request"]
-type: Feature
+labels: ["Android", "Feature"]
 body:
   - type: textarea
     id: problem
diff --git a/.github/ISSUE_TEMPLATE/feature_java.yml b/.github/ISSUE_TEMPLATE/feature_java.yml
index 11772b044f0..686ad45e229 100644
--- a/.github/ISSUE_TEMPLATE/feature_java.yml
+++ b/.github/ISSUE_TEMPLATE/feature_java.yml
@@ -1,7 +1,6 @@
 name: 💡 Feature Request - Java
 description: Tell us about a problem our SDK could solve but doesn't.
-labels: ["Platform: Java", "Type: Feature Request"]
-type: Feature
+labels: ["Java", "Feature"]
 body:
   - type: textarea
     id: problem
diff --git a/.github/ISSUE_TEMPLATE/maintainer-blank.yml b/.github/ISSUE_TEMPLATE/maintainer-blank.yml
index 3c4607c465a..150f35a1316 100644
--- a/.github/ISSUE_TEMPLATE/maintainer-blank.yml
+++ b/.github/ISSUE_TEMPLATE/maintainer-blank.yml
@@ -1,6 +1,6 @@
 name: Blank Issue
 description: Blank Issue. Reserved for maintainers.
-labels: ["Platform: Java"]
+labels: ["Java"]
 body:
   - type: textarea
     id: description