diff --git a/openapi.yaml b/openapi.yaml
index cea95588..bb4c102c 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -15746,33 +15746,6 @@ components:
               description: Icon URI representing the helm service.
               x-stoplight:
                 id: 117p5u95nwx2p
-    HelmPortResponseCommonProperties:
-      type: object
-      required:
-        - id
-        - internal_port
-        - protocol
-      properties:
-        id:
-          type: string
-          format: uuid
-        name:
-          type: string
-        internal_port:
-          type: integer
-          example: 8080
-          description: The listening port of your service.
-        external_port:
-          type: integer
-          example: 8080
-          description: The exposed port for your service. This is optional. If not set, a default port will be used.
-        namespace:
-          type: string
-        protocol:
-          $ref: '#/components/schemas/HelmPortProtocolEnum'
-        is_default:
-          type: boolean
-          description: is the default port to use for domain
     HelmResponse:
       allOf:
         - $ref: '#/components/schemas/Base'
@@ -15815,24 +15788,66 @@ components:
               type: array
               items:
                 oneOf:
-                  - allOf:
-                      - $ref: '#/components/schemas/HelmPortResponseCommonProperties'
-                      - type: object
-                        required:
-                          - service_name
-                        properties:
-                          service_name:
-                            type: string
-                  - allOf:
-                      - $ref: '#/components/schemas/HelmPortResponseCommonProperties'
-                      - type: object
-                        required:
-                          - service_selectors
-                        properties:
-                          service_selectors:
-                            type: array
-                            items:
-                              $ref: '#/components/schemas/KubernetesSelector'
+                  - type: object
+                    required:
+                      - id
+                      - internal_port
+                      - protocol
+                      - service_name
+                    properties:
+                      id:
+                        type: string
+                        format: uuid
+                      name:
+                        type: string
+                      internal_port:
+                        type: integer
+                        example: 8080
+                        description: The listening port of your service.
+                      external_port:
+                        type: integer
+                        example: 8080
+                        description: The exposed port for your service. This is optional. If not set a default port will be used.
+                      service_name:
+                        type: string
+                      namespace:
+                        type: string
+                      protocol:
+                        $ref: '#/components/schemas/HelmPortProtocolEnum'
+                      is_default:
+                        type: boolean
+                        description: is the default port to use for domain
+                  - type: object
+                    required:
+                      - id
+                      - internal_port
+                      - protocol
+                      - service_selectors
+                    properties:
+                      id:
+                        type: string
+                        format: uuid
+                      name:
+                        type: string
+                      internal_port:
+                        type: integer
+                        example: 8080
+                        description: The listening port of your service.
+                      external_port:
+                        type: integer
+                        example: 8080
+                        description: The exposed port for your service. This is optional. If not set a default port will be used.
+                      service_selectors:
+                        type: array
+                        items:
+                          $ref: '#/components/schemas/KubernetesSelector'
+                      namespace:
+                        type: string
+                      protocol:
+                        $ref: '#/components/schemas/HelmPortProtocolEnum'
+                      is_default:
+                        type: boolean
+                        description: is the default port to use for domain
             source:
               nullable: false
               oneOf:
@@ -16041,28 +16056,6 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/HelmDeploymentRestrictionResponse'
-    HelmPortRequestCommonProperties:
-      type: object
-      required:
-        - internal_port
-      properties:
-        name:
-          type: string
-        internal_port:
-          type: integer
-          example: 8080
-          description: The listening port of your service.
-        external_port:
-          type: integer
-          example: 8080
-          description: The exposed port for your service. This is optional. If not set, a default port will be used.
-        namespace:
-          type: string
-        protocol:
-          $ref: '#/components/schemas/HelmPortProtocolEnum'
-        is_default:
-          type: boolean
-          description: is the default port to use for domain
     HelmPortRequest:
       type: object
       properties:
@@ -16070,20 +16063,54 @@ components:
           type: array
           items:
             oneOf:
-              - allOf:
-                  - $ref: '#/components/schemas/HelmPortRequestCommonProperties'
-                  - type: object
-                    properties:
-                      service_name:
-                        type: string
-              - allOf:
-                  - $ref: '#/components/schemas/HelmPortRequestCommonProperties'
-                  - type: object
-                    properties:
-                      service_selectors:
-                        type: array
-                        items:
-                          $ref: '#/components/schemas/KubernetesSelector'
+              - type: object
+                required:
+                  - internal_port
+                properties:
+                  name:
+                    type: string
+                  internal_port:
+                    type: integer
+                    example: 8080
+                    description: The listening port of your service.
+                  external_port:
+                    type: integer
+                    example: 8080
+                    description: The exposed port for your service. This is optional. If not set a default port will be used.
+                  service_name:
+                    type: string
+                  namespace:
+                    type: string
+                  protocol:
+                    $ref: '#/components/schemas/HelmPortProtocolEnum'
+                  is_default:
+                    type: boolean
+                    description: is the default port to use for domain
+              - type: object
+                required:
+                  - internal_port
+                properties:
+                  name:
+                    type: string
+                  internal_port:
+                    type: integer
+                    example: 8080
+                    description: The listening port of your service.
+                  external_port:
+                    type: integer
+                    example: 8080
+                    description: The exposed port for your service. This is optional. If not set a default port will be used.
+                  service_selectors:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/KubernetesSelector'
+                  namespace:
+                    type: string
+                  protocol:
+                    $ref: '#/components/schemas/HelmPortProtocolEnum'
+                  is_default:
+                    type: boolean
+                    description: is the default port to use for domain
     HelmForceEvent:
       type: string
       enum: