diff --git a/docs/source/release/template.rst b/docs/source/release/template.rst
index 14e77420859..f608b18d94d 100644
--- a/docs/source/release/template.rst
+++ b/docs/source/release/template.rst
@@ -17,10 +17,6 @@ Deprecations
 ============
 
 
-Future Changes
-==============
-
-
 Expired Deprecations
 ====================
 
@@ -47,3 +43,16 @@ Performance Improvements and Changes
 
 Changes
 =======
+
+
+Documentation Changes
+=====================
+
+
+Infrastructure Related Changes
+==============================
+
+
+Bug Fixes
+=========
+
diff --git a/towncrier.toml b/towncrier.toml
index f807f1a5166..4b368754552 100644
--- a/towncrier.toml
+++ b/towncrier.toml
@@ -19,11 +19,6 @@ filename = "docs/source/release/{version}-notes.rst"
     name = "Deprecations"
     showcontent = true
 
-[[tool.towncrier.type]]
-    directory = "future"
-    name = "Future Changes"
-    showcontent = true
-
 [[tool.towncrier.type]]
     directory = "expired"
     name = "Expired Deprecations"
@@ -58,3 +53,18 @@ filename = "docs/source/release/{version}-notes.rst"
     directory = "change"
     name = "Changes"
     showcontent = true
+
+[[tool.towncrier.type]]
+    directory = "doc"
+    name = "Documentation Changes"
+    showcontent = true
+
+[[tool.towncrier.type]]
+    directory = "infrastructure"
+    name = "Infrastructure Related Changes"
+    showcontent = true
+
+[[tool.towncrier.type]]
+    directory = "bug_fix"
+    name = "Bug Fixes"
+    showcontent = true