diff --git a/ominfra/clouds/aws/models/gen/gen.py b/ominfra/clouds/aws/models/gen/gen.py
index d7179370a..30b654ab1 100644
--- a/ominfra/clouds/aws/models/gen/gen.py
+++ b/ominfra/clouds/aws/models/gen/gen.py
@@ -408,7 +408,7 @@ def gen_all_shapes(
 
         out.write('\n\n')
         out.write('ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([\n')
-        for n in all_shapes:
+        for n in sorted(all_shapes):
             out.write(f'    {n},\n')
         out.write('])\n')
 
@@ -469,7 +469,7 @@ def gen_all_operations(
 
         out.write('\n')
         out.write('ALL_OPERATIONS: frozenset[_base.Operation] = frozenset([\n')
-        for n in all_operations:
+        for n in sorted(all_operations):
             out.write(f'    {n},\n')
         out.write('])\n')
 
diff --git a/ominfra/clouds/aws/models/services/ec2.py b/ominfra/clouds/aws/models/services/ec2.py
index 6cd73eda8..2cca68369 100644
--- a/ominfra/clouds/aws/models/services/ec2.py
+++ b/ominfra/clouds/aws/models/services/ec2.py
@@ -3315,7 +3315,10 @@ class DescribeInstancesResult(
 
 
 ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([
+    BlockDeviceMapping,
     BlockPublicAccessStates,
+    CapacityReservationSpecification,
+    CapacityReservationSpecificationResponse,
     CapacityReservationTarget,
     CapacityReservationTargetResponse,
     ConnectionTrackingSpecificationRequest,
@@ -3323,31 +3326,47 @@ class DescribeInstancesResult(
     CpuOptions,
     CpuOptionsRequest,
     CreditSpecificationRequest,
+    DescribeInstancesRequest,
+    DescribeInstancesResult,
+    DescribeVpcsRequest,
+    DescribeVpcsResult,
     EbsBlockDevice,
+    EbsInstanceBlockDevice,
     ElasticGpuAssociation,
     ElasticGpuSpecification,
     ElasticInferenceAccelerator,
     ElasticInferenceAcceleratorAssociation,
+    EnaSrdSpecificationRequest,
     EnaSrdUdpSpecificationRequest,
     EnclaveOptions,
     EnclaveOptionsRequest,
+    Filter,
     GroupIdentifier,
     HibernationOptions,
     HibernationOptionsRequest,
     IamInstanceProfile,
     IamInstanceProfileSpecification,
+    Instance,
+    InstanceAttachmentEnaSrdSpecification,
     InstanceAttachmentEnaSrdUdpSpecification,
+    InstanceBlockDeviceMapping,
     InstanceIpv4Prefix,
     InstanceIpv6Address,
     InstanceIpv6Prefix,
     InstanceMaintenanceOptions,
     InstanceMaintenanceOptionsRequest,
+    InstanceMarketOptionsRequest,
     InstanceMetadataOptionsRequest,
     InstanceMetadataOptionsResponse,
+    InstanceNetworkInterface,
     InstanceNetworkInterfaceAssociation,
+    InstanceNetworkInterfaceAttachment,
+    InstanceNetworkInterfaceSpecification,
     InstanceNetworkPerformanceOptions,
     InstanceNetworkPerformanceOptionsRequest,
+    InstancePrivateIpAddress,
     InstanceState,
+    InstanceStateChange,
     Ipv4PrefixSpecificationRequest,
     Ipv6PrefixSpecificationRequest,
     LaunchTemplateSpecification,
@@ -3361,42 +3380,23 @@ class DescribeInstancesResult(
     PrivateDnsNameOptionsResponse,
     PrivateIpAddressSpecification,
     ProductCode,
+    RebootInstancesRequest,
+    Reservation,
     RunInstancesMonitoringEnabled,
+    RunInstancesRequest,
     SpotMarketOptions,
-    StateReason,
-    TagSpecification,
-    VpcCidrBlockState,
-    BlockDeviceMapping,
-    CapacityReservationSpecification,
-    CapacityReservationSpecificationResponse,
-    EbsInstanceBlockDevice,
-    EnaSrdSpecificationRequest,
-    Filter,
-    InstanceAttachmentEnaSrdSpecification,
-    InstanceMarketOptionsRequest,
-    InstancePrivateIpAddress,
-    InstanceStateChange,
-    RebootInstancesRequest,
     StartInstancesRequest,
-    StopInstancesRequest,
-    TerminateInstancesRequest,
-    VpcCidrBlockAssociation,
-    VpcIpv6CidrBlockAssociation,
-    InstanceBlockDeviceMapping,
-    InstanceNetworkInterfaceAttachment,
-    InstanceNetworkInterfaceSpecification,
-    DescribeInstancesRequest,
-    DescribeVpcsRequest,
-    InstanceNetworkInterface,
     StartInstancesResult,
+    StateReason,
+    StopInstancesRequest,
     StopInstancesResult,
+    TagSpecification,
+    TerminateInstancesRequest,
     TerminateInstancesResult,
     Vpc,
-    RunInstancesRequest,
-    DescribeVpcsResult,
-    Instance,
-    Reservation,
-    DescribeInstancesResult,
+    VpcCidrBlockAssociation,
+    VpcCidrBlockState,
+    VpcIpv6CidrBlockAssociation,
 ])
 
 
diff --git a/ominfra/clouds/aws/models/services/lambda_.py b/ominfra/clouds/aws/models/services/lambda_.py
index 2a9515a79..ef4af6c29 100644
--- a/ominfra/clouds/aws/models/services/lambda_.py
+++ b/ominfra/clouds/aws/models/services/lambda_.py
@@ -759,25 +759,25 @@ class ListFunctionsResponse(
 ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([
     DeadLetterConfig,
     EnvironmentError_,
+    EnvironmentResponse,
     EphemeralStorage,
     FileSystemConfig,
+    FunctionConfiguration,
+    ImageConfig,
     ImageConfigError,
+    ImageConfigResponse,
     InvalidParameterValueException,
     Layer,
     ListFunctionsRequest,
+    ListFunctionsResponse,
     LoggingConfig,
+    RuntimeVersionConfig,
     RuntimeVersionError,
     ServiceException,
     SnapStartResponse,
     TooManyRequestsException,
     TracingConfigResponse,
-    EnvironmentResponse,
-    ImageConfig,
-    RuntimeVersionConfig,
     VpcConfigResponse,
-    ImageConfigResponse,
-    FunctionConfiguration,
-    ListFunctionsResponse,
 ])
 
 
diff --git a/ominfra/clouds/aws/models/services/rds.py b/ominfra/clouds/aws/models/services/rds.py
index edc086bae..6ea8438b9 100644
--- a/ominfra/clouds/aws/models/services/rds.py
+++ b/ominfra/clouds/aws/models/services/rds.py
@@ -1517,18 +1517,36 @@ class DBInstanceMessage(
 
 ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([
     AuthorizationNotFoundFault,
+    AvailabilityZone,
     BackupPolicyNotFoundFault,
+    CertificateDetails,
     CertificateNotFoundFault,
+    CreateDBInstanceMessage,
+    CreateDBInstanceResult,
     DBClusterNotFoundFault,
+    DBInstance,
     DBInstanceAlreadyExistsFault,
     DBInstanceAutomatedBackupQuotaExceededFault,
+    DBInstanceAutomatedBackupsReplication,
+    DBInstanceMessage,
     DBInstanceNotFoundFault,
+    DBInstanceRole,
+    DBInstanceStatusInfo,
     DBParameterGroupNotFoundFault,
+    DBParameterGroupStatus,
+    DBSecurityGroupMembership,
     DBSecurityGroupNotFoundFault,
     DBSnapshotAlreadyExistsFault,
+    DBSubnetGroup,
     DBSubnetGroupDoesNotCoverEnoughAZs,
     DBSubnetGroupNotFoundFault,
+    DeleteDBInstanceMessage,
+    DeleteDBInstanceResult,
+    DescribeDBInstancesMessage,
+    DomainMembership,
     DomainNotFoundFault,
+    Endpoint,
+    Filter,
     InstanceQuotaExceededFault,
     InsufficientDBInstanceCapacityFault,
     InvalidDBClusterStateFault,
@@ -1536,45 +1554,27 @@ class DBInstanceMessage(
     InvalidSubnet,
     InvalidVPCNetworkStateFault,
     KMSKeyNotAccessibleFault,
-    NetworkTypeNotSupported,
-    OptionGroupNotFoundFault,
-    ProvisionedIopsNotAvailableInAZFault,
-    SnapshotQuotaExceededFault,
-    StorageQuotaExceededFault,
-    StorageTypeNotSupportedFault,
-    TenantDatabaseQuotaExceededFault,
-    AvailabilityZone,
-    CertificateDetails,
-    DBInstanceAutomatedBackupsReplication,
-    DBInstanceRole,
-    DBInstanceStatusInfo,
-    DBParameterGroupStatus,
-    DBSecurityGroupMembership,
-    DeleteDBInstanceMessage,
-    Endpoint,
     MasterUserSecret,
+    NetworkTypeNotSupported,
     OptionGroupMembership,
+    OptionGroupNotFoundFault,
     Outpost,
-    ProcessorFeature,
-    RebootDBInstanceMessage,
-    StartDBInstanceMessage,
-    StopDBInstanceMessage,
-    VpcSecurityGroupMembership,
-    DomainMembership,
-    Filter,
     PendingCloudwatchLogsExports,
-    Subnet,
-    CreateDBInstanceMessage,
     PendingModifiedValues,
-    DBSubnetGroup,
-    DescribeDBInstancesMessage,
-    DBInstance,
-    CreateDBInstanceResult,
-    DeleteDBInstanceResult,
+    ProcessorFeature,
+    ProvisionedIopsNotAvailableInAZFault,
+    RebootDBInstanceMessage,
     RebootDBInstanceResult,
+    SnapshotQuotaExceededFault,
+    StartDBInstanceMessage,
     StartDBInstanceResult,
+    StopDBInstanceMessage,
     StopDBInstanceResult,
-    DBInstanceMessage,
+    StorageQuotaExceededFault,
+    StorageTypeNotSupportedFault,
+    Subnet,
+    TenantDatabaseQuotaExceededFault,
+    VpcSecurityGroupMembership,
 ])
 
 
diff --git a/ominfra/clouds/aws/models/services/s3.py b/ominfra/clouds/aws/models/services/s3.py
index eeb475ec5..1a940ed41 100644
--- a/ominfra/clouds/aws/models/services/s3.py
+++ b/ominfra/clouds/aws/models/services/s3.py
@@ -1147,28 +1147,28 @@ class ListObjectsV2Output(
 
 
 ALL_SHAPES: frozenset[type[_base.Shape]] = frozenset([
-    EncryptionTypeMismatch,
-    InvalidRequest,
-    InvalidWriteOffset,
-    NoSuchBucket,
-    NoSuchKey,
-    TooManyParts,
     Bucket,
     CommonPrefix,
     DeleteObjectOutput,
     DeleteObjectRequest,
+    EncryptionTypeMismatch,
+    GetObjectOutput,
     GetObjectRequest,
     InvalidObjectState,
+    InvalidRequest,
+    InvalidWriteOffset,
+    ListBucketsOutput,
     ListBucketsRequest,
-    Owner,
-    PutObjectOutput,
-    RestoreStatus,
-    GetObjectOutput,
+    ListObjectsV2Output,
     ListObjectsV2Request,
+    NoSuchBucket,
+    NoSuchKey,
     Object,
+    Owner,
+    PutObjectOutput,
     PutObjectRequest,
-    ListBucketsOutput,
-    ListObjectsV2Output,
+    RestoreStatus,
+    TooManyParts,
 ])