diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index d8ad0616938..8af93e4f645 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -16,7 +16,6 @@
 :cl:
 add: Added new mechanics or gameplay changes
 add: Added more things
-expansion: Expands content of an existing feature
 del: Removed old things
 qol: made something easier to use
 balance: rebalanced something
diff --git a/.github/gbp.toml b/.github/gbp.toml
index d4fc45d69df..3e5be35e4a6 100644
--- a/.github/gbp.toml
+++ b/.github/gbp.toml
@@ -7,13 +7,16 @@ reset_label = "GBP: Reset"
 "Atomic" = 2
 "Balance/Rebalance" = -5
 "Code Improvement" = 2
-"Content Expansion" = -3
 "Feedback" = 2
 "Fix" = 4
 "Grammar and Formatting" = 1
 "Hard Deletes" = 12
 "Logging" = 1
+<<<<<<< HEAD
 "Mechanic" = -12
+=======
+"Feature" = -6
+>>>>>>> 93f39af8ac7 (removes the Content Expansion tag, replaces Mechanic with Feature, and lowers its gbp cost from 10 to 6 (#66425))
 "Performance" = 12
 "Priority: CRITICAL" = 20
 "Priority: High" = 15
diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php
index 6700faa331c..140abd7bd56 100644
--- a/tools/WebhookProcessor/github_webhook_processor.php
+++ b/tools/WebhookProcessor/github_webhook_processor.php
@@ -731,7 +731,7 @@ function checkchangelog($payload, $compile = true) {
 			case 'adds':
 			case 'rscadd':
 				if($item != 'Added new mechanics or gameplay changes' && $item != 'Added more things') {
-					$tags[] = 'Mechanic';
+					$tags[] = 'Feature';
 					$currentchangelogblock[] = array('type' => 'rscadd', 'body' => $item);
 				}
 				break;
@@ -777,12 +777,6 @@ function checkchangelog($payload, $compile = true) {
 					$currentchangelogblock[] = array('type' => 'code_imp', 'body' => $item);
 				}
 				break;
-			case 'expansion':
-				if($item != 'Expands content of an existing feature'){
-					$tags[] = 'Content Expansion';
-					$currentchangelogblock[] = array('type' => 'expansion', 'body' => $item);
-				}
-				break;
 			case 'refactor':
 				if($item != 'refactored some code'){
 					$tags[] = 'Refactor';
diff --git a/tools/ss13_genchangelog.py b/tools/ss13_genchangelog.py
index b1f41ed5ae9..fdd1bec6bb8 100644
--- a/tools/ss13_genchangelog.py
+++ b/tools/ss13_genchangelog.py
@@ -53,7 +53,6 @@ validPrefixes = [
     'rscdel',
     'imageadd',
     'imagedel',
-    'expansion',
     'spellcheck',
     'experiment',
     'balance',