diff --git a/admin/admin-v2.yaml b/admin/admin-v2.yaml
index a9bc70c..c3f19b5 100644
--- a/admin/admin-v2.yaml
+++ b/admin/admin-v2.yaml
@@ -441,13 +441,11 @@ components:
           title: host
           type: string
         operation:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.common.v1.ACLOperation"
+          $ref: "#/components/schemas/redpanda.core.common.v1.ACLOperation"
           description: The ACL operation to match
           title: operation
         permissionType:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.common.v1.ACLPermissionType"
+          $ref: "#/components/schemas/redpanda.core.common.v1.ACLPermissionType"
           description: The permission type
           title: permission_type
         principal:
@@ -463,13 +461,11 @@ components:
       description: A filter for ACLs
       properties:
         accessFilter:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ACLAccessFilter"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ACLAccessFilter"
           description: The access filter
           title: access_filter
         resourceFilter:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ACLResourceFilter"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ACLResourceFilter"
           description: The resource filter
           title: resource_filter
       title: ACLFilter
@@ -486,13 +482,11 @@ components:
           title: name
           type: string
         patternType:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.common.v1.ACLPattern"
+          $ref: "#/components/schemas/redpanda.core.common.v1.ACLPattern"
           description: The pattern to apply to name
           title: pattern_type
         resourceType:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.common.v1.ACLResource"
+          $ref: "#/components/schemas/redpanda.core.common.v1.ACLResource"
           description: The ACL resource type to match
           title: resource_type
       title: ACLResourceFilter
@@ -523,8 +517,7 @@ components:
       description: AddRoleMembersResponse is the response from the AddRoleMembers RPC.
       properties:
         role:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.Role"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.Role"
           description: The updated Role.
           title: role
       title: AddRoleMembersResponse
@@ -550,8 +543,7 @@ components:
       oneOf:
         - properties:
             plainConfiguration:
-              allOf:
-                - $ref: "#/components/schemas/redpanda.core.admin.v2.PlainConfig"
+              $ref: "#/components/schemas/redpanda.core.admin.v2.PlainConfig"
               description: SASL/PLAIN configuration
               title: plain_configuration
           required:
@@ -559,8 +551,7 @@ components:
           title: plain_configuration
         - properties:
             scramConfiguration:
-              allOf:
-                - $ref: "#/components/schemas/redpanda.core.admin.v2.ScramConfig"
+              $ref: "#/components/schemas/redpanda.core.admin.v2.ScramConfig"
               description: SASL/SCRAM configuration
               title: scram_configuration
           required:
@@ -573,13 +564,11 @@ components:
       description: Other Messages
       properties:
         mechanism:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.AuthenticationMechanism"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.AuthenticationMechanism"
           description: Authentication mechanism
           title: mechanism
         state:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.AuthenticationState"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.AuthenticationState"
           description: Authentication state
           title: state
         userPrincipal:
@@ -611,8 +600,7 @@ components:
       description: The resource for an individual broker within the Kafka Cluster.
       properties:
         adminServer:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.AdminServer"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.AdminServer"
           description: |-
             The admin server information.
 
@@ -620,8 +608,7 @@ components:
           nullable: true
           title: admin_server
         buildInfo:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.BuildInfo"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.BuildInfo"
           description: |-
             The build this broker is running.
 
@@ -654,8 +641,7 @@ components:
       description: Options for syncing consumer offsets
       properties:
         effectiveInterval:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Duration"
+          $ref: "#/components/schemas/google.protobuf.Duration"
           description: The effective interval for the task
           readOnly: true
           title: effective_interval
@@ -666,8 +652,7 @@ components:
           title: group_filters
           type: array
         interval:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Duration"
+          $ref: "#/components/schemas/google.protobuf.Duration"
           description: |-
             Sync interval
              If 0 provided, defaults to 30 seconds
@@ -686,8 +671,7 @@ components:
       description: CreateRoleRequest is the request for the CreateRole RPC.
       properties:
         role:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.Role"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.Role"
           description: The Role to create.
           title: role
       required:
@@ -699,8 +683,7 @@ components:
       description: CreateRoleResponse is the response from the CreateRole RPC.
       properties:
         role:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.Role"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.Role"
           description: The created Role.
           title: role
       title: CreateRoleResponse
@@ -712,8 +695,7 @@ components:
          RPC.
       properties:
         scramCredential:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ScramCredential"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ScramCredential"
           description: The SCRAM credential to create.
           title: scram_credential
       required:
@@ -727,8 +709,7 @@ components:
          RPC.
       properties:
         scramCredential:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ScramCredential"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ScramCredential"
           description: The created SCRAM credential.
           title: scram_credential
       title: CreateScramCredentialResponse
@@ -738,8 +719,7 @@ components:
       description: Create a new shadow link
       properties:
         shadowLink:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
           description: The shadow link to create
           title: shadow_link
       title: CreateShadowLinkRequest
@@ -749,8 +729,7 @@ components:
       description: Response to creating a shadow link
       properties:
         shadowLink:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
           description: The shadow link that was created
           title: shadow_link
       title: CreateShadowLinkResponse
@@ -844,8 +823,7 @@ components:
       description: The response to the FailOverRequest
       properties:
         shadowLink:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
           description: The shadow link that was failed over
           title: shadow_link
       title: FailOverResponse
@@ -877,8 +855,7 @@ components:
       description: GetBrokerResponse is the response from the GetBroker RPC.
       properties:
         broker:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.Broker"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.Broker"
           description: The specified broker and it's information.
           title: broker
       title: GetBrokerResponse
@@ -900,8 +877,7 @@ components:
       description: GetRoleResponse is the response from the GetRole RPC.
       properties:
         role:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.Role"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.Role"
           description: The requested Role.
           title: role
       title: GetRoleResponse
@@ -923,8 +899,7 @@ components:
       description: GetScramCredentialResponse is the response from the GetScramCredential RPC.
       properties:
         scramCredential:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ScramCredential"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ScramCredential"
           description: The requested SCRAM credential.
           title: scram_credential
       title: GetScramCredentialResponse
@@ -946,8 +921,7 @@ components:
       description: Response to getting a shadow link
       properties:
         shadowLink:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
           description: The shadow link that was retrieved
           title: shadow_link
       title: GetShadowLinkResponse
@@ -974,8 +948,7 @@ components:
       description: Response of to getting a shadow topic
       properties:
         shadowTopic:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowTopic"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowTopic"
           title: shadow_topic
       title: GetShadowTopicResponse
       type: object
@@ -1007,8 +980,7 @@ components:
           title: api_key
           type: integer
         inFlightDuration:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Duration"
+          $ref: "#/components/schemas/google.protobuf.Duration"
           description: How long the request has been in-flight since it was received
           title: in_flight_duration
       title: Request
@@ -1040,8 +1012,7 @@ components:
           title: api_versions
           type: object
         authenticationInfo:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.AuthenticationInfo"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.AuthenticationInfo"
           description: Information about the authentication state of the connection
           title: authentication_info
         clientId:
@@ -1067,8 +1038,7 @@ components:
           title: client_software_version
           type: string
         closeTime:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Timestamp"
+          $ref: "#/components/schemas/google.protobuf.Timestamp"
           description: |-
             When the connection was closed. This field is set only when the
              connection state is "closed".
@@ -1096,13 +1066,11 @@ components:
           title: group_member_id
           type: string
         idleDuration:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Duration"
+          $ref: "#/components/schemas/google.protobuf.Duration"
           description: How long the connection has been idle (no in-flight requests)
           title: idle_duration
         inFlightRequests:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.InFlightRequests"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.InFlightRequests"
           description: Currently in-flight requests
           title: in_flight_requests
         listenerName:
@@ -1119,13 +1087,11 @@ components:
           title: node_id
           type: integer
         openTime:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Timestamp"
+          $ref: "#/components/schemas/google.protobuf.Timestamp"
           description: When the broker accepted the connection
           title: open_time
         recentRequestStatistics:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.RequestStatistics"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.RequestStatistics"
           description: Statistics for previous last one minute window.
           title: recent_request_statistics
         shardId:
@@ -1133,25 +1099,21 @@ components:
           title: shard_id
           type: integer
         source:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.Source"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.Source"
           description: Remote client address of the TCP connection
           title: source
         state:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.KafkaConnectionState"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.KafkaConnectionState"
           description: Lifecycle state of the connection (open/aborting/closed)
           title: state
         tlsInfo:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.TLSInfo"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.TLSInfo"
           description: |-
             Information about the TLS state of the connection (e.g., whether TLS
              encryption is used for this connection)
           title: tls_info
         totalRequestStatistics:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.RequestStatistics"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.RequestStatistics"
           description: Aggregated statistics for the entire connection's lifetime.
           title: total_request_statistics
         transactionalId:
@@ -1404,8 +1366,7 @@ components:
       description: A filter based on the name of a resource
       properties:
         filterType:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.FilterType"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.FilterType"
           description: Include or exclude
           title: filter_type
         name:
@@ -1416,8 +1377,7 @@ components:
           title: name
           type: string
         patternType:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.PatternType"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.PatternType"
           description: Literal or prefix
           title: pattern_type
       title: NameFilter
@@ -1446,8 +1406,7 @@ components:
           title: password_set
           type: boolean
         passwordSetAt:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Timestamp"
+          $ref: "#/components/schemas/google.protobuf.Timestamp"
           description: |-
             Timestamp of when the password was last set - only valid if password_set
              is true
@@ -1515,8 +1474,7 @@ components:
       description: RemoveRoleMembersResponse is the response from the RemoveRoleMembers RPC.
       properties:
         role:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.Role"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.Role"
           description: The updated Role.
           title: role
       title: RemoveRoleMembersResponse
@@ -1566,8 +1524,7 @@ components:
       description: ResolveOidcIdentityResponse is the response from the ResolveOidcIdentity RPC.
       properties:
         expire:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Timestamp"
+          $ref: "#/components/schemas/google.protobuf.Timestamp"
           description: The timestamp of the token's expiry.
           title: expire
         groups:
@@ -1626,16 +1583,14 @@ components:
       oneOf:
         - properties:
             group:
-              allOf:
-                - $ref: "#/components/schemas/redpanda.core.admin.v2.RoleGroup"
+              $ref: "#/components/schemas/redpanda.core.admin.v2.RoleGroup"
               title: group
           required:
             - group
           title: group
         - properties:
             user:
-              allOf:
-                - $ref: "#/components/schemas/redpanda.core.admin.v2.RoleUser"
+              $ref: "#/components/schemas/redpanda.core.admin.v2.RoleUser"
               title: user
           required:
             - user
@@ -1658,8 +1613,7 @@ components:
       oneOf:
         - properties:
             shadowSchemaRegistryTopic:
-              allOf:
-                - $ref: "#/components/schemas/redpanda.core.admin.v2.SchemaRegistrySyncOptions.ShadowSchemaRegistryTopic"
+              $ref: "#/components/schemas/redpanda.core.admin.v2.SchemaRegistrySyncOptions.ShadowSchemaRegistryTopic"
               title: shadow_schema_registry_topic
           required:
             - shadowSchemaRegistryTopic
@@ -1699,16 +1653,14 @@ components:
           title: password_set
           type: boolean
         passwordSetAt:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Timestamp"
+          $ref: "#/components/schemas/google.protobuf.Timestamp"
           description: |-
             Timestamp of when the password was last set - only valid if password_set
              is true
           readOnly: true
           title: password_set_at
         scramMechanism:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ScramMechanism"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ScramMechanism"
           description: The SCRAM mechanism to use
           title: scram_mechanism
         username:
@@ -1722,8 +1674,7 @@ components:
       description: The ScramCredential resource used for SCRAM authentication.
       properties:
         mechanism:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.common.v1.ScramMechanism"
+          $ref: "#/components/schemas/redpanda.core.common.v1.ScramMechanism"
           description: The SCRAM mechanism used for this credential.
           title: mechanism
         name:
@@ -1736,8 +1687,7 @@ components:
           type: string
           writeOnly: true
         passwordSetAt:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Timestamp"
+          $ref: "#/components/schemas/google.protobuf.Timestamp"
           description: |-
             The timestamp when the password was last set.
              For passwords set before this feature was implemented, this will return
@@ -1767,14 +1717,12 @@ components:
           title: acl_filters
           type: array
         effectiveInterval:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Duration"
+          $ref: "#/components/schemas/google.protobuf.Duration"
           description: The effective interval for the task
           readOnly: true
           title: effective_interval
         interval:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Duration"
+          $ref: "#/components/schemas/google.protobuf.Duration"
           description: |-
             Sync interval
              If 0 provided, defaults to 30 seconds
@@ -1793,8 +1741,7 @@ components:
       description: A ShadowLink resource
       properties:
         configurations:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLinkConfigurations"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLinkConfigurations"
           description: Shadow link configuration
           title: configurations
         name:
@@ -1802,8 +1749,7 @@ components:
           title: name
           type: string
         status:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLinkStatus"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLinkStatus"
           description: Status of the shadow link
           readOnly: true
           title: status
@@ -1821,8 +1767,7 @@ components:
       description: Options for the client link
       properties:
         authenticationConfiguration:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.AuthenticationConfiguration"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.AuthenticationConfiguration"
           description: Authentication settings
           nullable: true
           title: authentication_configuration
@@ -1939,8 +1884,7 @@ components:
           title: source_cluster_id
           type: string
         tlsSettings:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.common.v1.TLSSettings"
+          $ref: "#/components/schemas/redpanda.core.common.v1.TLSSettings"
           description: TLS settings
           nullable: true
           title: tls_settings
@@ -1953,28 +1897,23 @@ components:
       description: ShadowLink options
       properties:
         clientOptions:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLinkClientOptions"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLinkClientOptions"
           description: Configuration for the internal kafka client
           title: client_options
         consumerOffsetSyncOptions:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ConsumerOffsetSyncOptions"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ConsumerOffsetSyncOptions"
           description: Consumer offset sync options
           title: consumer_offset_sync_options
         schemaRegistrySyncOptions:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.SchemaRegistrySyncOptions"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.SchemaRegistrySyncOptions"
           description: Schema Registry sync options
           title: schema_registry_sync_options
         securitySyncOptions:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.SecuritySettingsSyncOptions"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.SecuritySettingsSyncOptions"
           description: Security settings sync options
           title: security_sync_options
         topicMetadataSyncOptions:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.TopicMetadataSyncOptions"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.TopicMetadataSyncOptions"
           description: Topic metadata sync options
           title: topic_metadata_sync_options
       title: ShadowLinkConfigurations
@@ -1998,8 +1937,7 @@ components:
           title: shadow_topics
           type: array
         state:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLinkState"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLinkState"
           title: state
         syncedShadowTopicProperties:
           description: List of topic properties that are being synced
@@ -2038,8 +1976,7 @@ components:
           title: shard
           type: integer
         state:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.TaskState"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.TaskState"
           description: State of the task
           title: state
       title: ShadowLinkTaskStatus
@@ -2063,8 +2000,7 @@ components:
           title: source_topic_name
           type: string
         status:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowTopicStatus"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowTopicStatus"
           description: The status of the shadow topic
           readOnly: true
           title: status
@@ -2099,8 +2035,7 @@ components:
           title: partition_information
           type: array
         state:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowTopicState"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowTopicState"
           description: State of the shadow topic
           title: state
       title: ShadowTopicStatus
@@ -2158,8 +2093,7 @@ components:
               title: auto_create_shadow_topic_filters
               type: array
             effectiveInterval:
-              allOf:
-                - $ref: "#/components/schemas/google.protobuf.Duration"
+              $ref: "#/components/schemas/google.protobuf.Duration"
               description: The effective interval for the task
               readOnly: true
               title: effective_interval
@@ -2179,8 +2113,7 @@ components:
               title: exclude_default
               type: boolean
             interval:
-              allOf:
-                - $ref: "#/components/schemas/google.protobuf.Duration"
+              $ref: "#/components/schemas/google.protobuf.Duration"
               description: |-
                 How often to sync metadata
                  If 0 provided, defaults to 30 seconds
@@ -2219,8 +2152,7 @@ components:
         - oneOf:
             - properties:
                 startAtEarliest:
-                  allOf:
-                    - $ref: "#/components/schemas/redpanda.core.admin.v2.TopicMetadataSyncOptions.EarliestOffset"
+                  $ref: "#/components/schemas/redpanda.core.admin.v2.TopicMetadataSyncOptions.EarliestOffset"
                   description: |-
                     Enables data replication from the earliest offset
                      on the source topic/partition.
@@ -2230,8 +2162,7 @@ components:
               title: start_at_earliest
             - properties:
                 startAtLatest:
-                  allOf:
-                    - $ref: "#/components/schemas/redpanda.core.admin.v2.TopicMetadataSyncOptions.LatestOffset"
+                  $ref: "#/components/schemas/redpanda.core.admin.v2.TopicMetadataSyncOptions.LatestOffset"
                   description: |-
                     Enables data replication from the latest offset
                      on the source topic/partition.
@@ -2241,8 +2172,7 @@ components:
               title: start_at_latest
             - properties:
                 startAtTimestamp:
-                  allOf:
-                    - $ref: "#/components/schemas/google.protobuf.Timestamp"
+                  $ref: "#/components/schemas/google.protobuf.Timestamp"
                   description: |-
                     Enables data replication from the first offset on the
                      source topic/partition where the record's timestamp is
@@ -2297,8 +2227,7 @@ components:
             - integer
             - string
         sourceLastUpdatedTimestamp:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.Timestamp"
+          $ref: "#/components/schemas/google.protobuf.Timestamp"
           description: Timestamp of the last time the source partition information was updated
           title: source_last_updated_timestamp
       title: TopicPartitionInformation
@@ -2310,13 +2239,11 @@ components:
          RPC.
       properties:
         scramCredential:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ScramCredential"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ScramCredential"
           description: The SCRAM credential to update.
           title: scram_credential
         updateMask:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.FieldMask"
+          $ref: "#/components/schemas/google.protobuf.FieldMask"
           description: |-
             The list of fields to update
              See [AIP-134](https://google.aip.dev/134) for how to use `field_mask`
@@ -2332,8 +2259,7 @@ components:
          RPC.
       properties:
         scramCredential:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ScramCredential"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ScramCredential"
           description: The updated SCRAM credential.
           title: scram_credential
       title: UpdateScramCredentialResponse
@@ -2343,13 +2269,11 @@ components:
       description: Updates a shadow link
       properties:
         shadowLink:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
           description: The shadow link to update
           title: shadow_link
         updateMask:
-          allOf:
-            - $ref: "#/components/schemas/google.protobuf.FieldMask"
+          $ref: "#/components/schemas/google.protobuf.FieldMask"
           description: |-
             The list of fields to update
              See [AIP-134](https://google.aip.dev/134) for how to use `field_mask`
@@ -2361,8 +2285,7 @@ components:
       description: Response to the update shadow link request
       properties:
         shadowLink:
-          allOf:
-            - $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
+          $ref: "#/components/schemas/redpanda.core.admin.v2.ShadowLink"
           description: The shadow link that was updated
           title: shadow_link
       title: UpdateShadowLinkResponse
@@ -2487,8 +2410,7 @@ components:
         - oneOf:
             - properties:
                 tlsFileSettings:
-                  allOf:
-                    - $ref: "#/components/schemas/redpanda.core.common.v1.TLSFileSettings"
+                  $ref: "#/components/schemas/redpanda.core.common.v1.TLSFileSettings"
                   description: Certificates and keys are provided as files
                   title: tls_file_settings
               required:
@@ -2496,8 +2418,7 @@ components:
               title: tls_file_settings
             - properties:
                 tlsPemSettings:
-                  allOf:
-                    - $ref: "#/components/schemas/redpanda.core.common.v1.TLSPEMSettings"
+                  $ref: "#/components/schemas/redpanda.core.common.v1.TLSPEMSettings"
                   description: Certificates and keys are provided in PEM format
                   title: tls_pem_settings
               required:
@@ -2511,9 +2432,9 @@ info:
   title: Redpanda Admin API
   version: v2.0.0
   x-admin-api-major: v2.0.0
-  x-generated-at: 2026-03-19T03:09:31.752Z
+  x-generated-at: 2026-04-03T17:41:20.987Z
   x-generator: redpanda-docs-openapi-bundler
-  x-redpanda-core-version: v26.1.1-rc2
+  x-redpanda-core-version: v26.1.2
 openapi: 3.1.0
 paths:
   /redpanda.core.admin.v2.BrokerService/GetBroker: