diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesController.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesController.java
index 10b8a2eec..9e0425d00 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesController.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntitiesController.java
@@ -38,7 +38,7 @@
                           "/api/entities" }, // existing - included to break no existing code
                 method = RequestMethod.GET)
 @Slf4j
-@Tags(value = {@Tag(name = "entity")})
+@Tags(value = {@Tag(name = "MDQ")})
 public class EntitiesController {
     @Autowired
     private EntityDescriptorService entityDescriptorService;
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 99b2ed200..7943285f7 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -109,6 +109,8 @@ shibui.roles.authenticated=ADMIN,ENABLE,USER
 shibui.beacon-enabled=true
 
 springdoc.use-management-port=true
+springdoc.swagger-ui.tagsSorter: alpha
+springdoc.writer-with-order-by-keys: true
 springdoc.pathsToMatch=/entities, /api/**
 # This property enables the openapi and swagger-ui endpoints to be exposed beneath the actuator base path.
 management.endpoints.web.exposure.include=openapi, swagger-ui