diff --git a/interfaces/openapi-to-go-server/apis.py b/interfaces/openapi-to-go-server/apis.py
index 102b496e8..58774a6b5 100644
--- a/interfaces/openapi-to-go-server/apis.py
+++ b/interfaces/openapi-to-go-server/apis.py
@@ -59,7 +59,7 @@ def filter_operations(self, tags: Set[str]):
         self.data_types = [dt for dt in self.data_types
                            if dt.name in required_data_types]
 
-    def security_scopes(self) -> Set[Tuple[str, operations.Scope]]:
+    def security_scopes(self) -> List[Tuple[str, operations.Scope]]:
         """Returns a set of unique security scopes used by this API.
 
         :return: set of unique tuples containing the authorization scheme and scope
@@ -70,7 +70,7 @@ def security_scopes(self) -> Set[Tuple[str, operations.Scope]]:
             for scheme, scopes in so.option.items():
                 for scope in scopes:
                     scopes_set.add((scheme, scope))
-        return scopes_set
+        return sorted(scopes_set, key=lambda s: s[1].name)
 
 
 def make_api(package: str, api_path: str, spec: Dict) -> API:
diff --git a/pkg/api/auxv1/interface.gen.go b/pkg/api/auxv1/interface.gen.go
index b1f3a610c..12d1847b9 100644
--- a/pkg/api/auxv1/interface.gen.go
+++ b/pkg/api/auxv1/interface.gen.go
@@ -7,10 +7,10 @@ import (
 )
 
 var (
+	DssReadIdentificationServiceAreasScope  = api.RequiredScope("dss.read.identification_service_areas")
+	DssWriteIdentificationServiceAreasScope = api.RequiredScope("dss.write.identification_service_areas")
 	InterussPoolStatusHeartbeatWriteScope   = api.RequiredScope("interuss.pool_status.heartbeat.write")
 	InterussPoolStatusReadScope             = api.RequiredScope("interuss.pool_status.read")
-	DssWriteIdentificationServiceAreasScope = api.RequiredScope("dss.write.identification_service_areas")
-	DssReadIdentificationServiceAreasScope  = api.RequiredScope("dss.read.identification_service_areas")
 	GetVersionSecurity                      = []api.AuthorizationOption{}
 	ValidateOauthSecurity                   = []api.AuthorizationOption{
 		{
diff --git a/pkg/api/ridv2/interface.gen.go b/pkg/api/ridv2/interface.gen.go
index d8a524f20..406d8460f 100644
--- a/pkg/api/ridv2/interface.gen.go
+++ b/pkg/api/ridv2/interface.gen.go
@@ -7,8 +7,8 @@ import (
 )
 
 var (
-	RidServiceProviderScope                  = api.RequiredScope("rid.service_provider")
 	RidDisplayProviderScope                  = api.RequiredScope("rid.display_provider")
+	RidServiceProviderScope                  = api.RequiredScope("rid.service_provider")
 	SearchIdentificationServiceAreasSecurity = []api.AuthorizationOption{
 		{
 			"Authority": {RidDisplayProviderScope},
diff --git a/pkg/api/scdv1/interface.gen.go b/pkg/api/scdv1/interface.gen.go
index 1a60c456a..cff1dd64f 100644
--- a/pkg/api/scdv1/interface.gen.go
+++ b/pkg/api/scdv1/interface.gen.go
@@ -8,10 +8,10 @@ import (
 
 var (
 	UtmAvailabilityArbitrationScope          = api.RequiredScope("utm.availability_arbitration")
-	UtmConstraintManagementScope             = api.RequiredScope("utm.constraint_management")
 	UtmConformanceMonitoringSaScope          = api.RequiredScope("utm.conformance_monitoring_sa")
-	UtmStrategicCoordinationScope            = api.RequiredScope("utm.strategic_coordination")
+	UtmConstraintManagementScope             = api.RequiredScope("utm.constraint_management")
 	UtmConstraintProcessingScope             = api.RequiredScope("utm.constraint_processing")
+	UtmStrategicCoordinationScope            = api.RequiredScope("utm.strategic_coordination")
 	QueryOperationalIntentReferencesSecurity = []api.AuthorizationOption{
 		{
 			"Authority": {UtmStrategicCoordinationScope},