diff --git a/src/main/java/de/rwth/idsg/steve/config/ApiDocsConfiguration.java b/src/main/java/de/rwth/idsg/steve/config/ApiDocsConfiguration.java
index 18b36f5e5..2b1d65076 100644
--- a/src/main/java/de/rwth/idsg/steve/config/ApiDocsConfiguration.java
+++ b/src/main/java/de/rwth/idsg/steve/config/ApiDocsConfiguration.java
@@ -60,6 +60,10 @@ public class ApiDocsConfiguration {
         System.setProperty("springdoc.swagger-ui.path", "/manager/swagger-ui/index.html");
         // We only want REST APIs here (de.rwth.idsg.steve.web.api package)
         System.setProperty("springdoc.paths-to-match", "/api/**");
+        // Sort controllers alphabetically by their path
+        System.setProperty("springdoc.swagger-ui.tagsSorter", "alpha");
+        // Sort endpoints (within a controller) alphabetically by their path
+        System.setProperty("springdoc.swagger-ui.operationsSorter", "alpha");
     }
 
     @Bean