diff --git a/websocket/websocket-openapi.yaml b/websocket/websocket-openapi.yaml
index 05e39bfc..5d6dfa85 100644
--- a/websocket/websocket-openapi.yaml
+++ b/websocket/websocket-openapi.yaml
@@ -932,6 +932,16 @@ components:
           - 'null'
           format: int32
           minimum: 0
+    MissingComponentValue:
+      type: object
+      required:
+      - component_name
+      - type
+      properties:
+        component_name:
+          type: string
+        type:
+          type: string
     NodeAddressDto:
       type: object
       required:
@@ -1118,6 +1128,33 @@ components:
             type: integer
             format: int32
             minimum: 0
+    PodInErrorValue:
+      type: object
+      required:
+      - component_name
+      - pod_name
+      - container_name
+      - level
+      - type
+      properties:
+        component_name:
+          type: string
+        container_name:
+          type: string
+        level:
+          $ref: '#/components/schemas/QoveryComponentContainerStatusLevel'
+        message:
+          type:
+          - string
+          - 'null'
+        pod_name:
+          type: string
+        reason:
+          type:
+          - string
+          - 'null'
+        type:
+          type: string
     PodQoveryServiceInfoDto:
       type: object
       required:
@@ -1210,32 +1247,37 @@ components:
       oneOf:
       - type: object
         required:
-        - Ok
+        - kube_version
+        - type
         properties:
-          Ok:
-            type: object
-            required:
-            - kube_version
-            properties:
-              kube_version:
-                type: string
+          kube_version:
+            type: string
+          type:
+            type: string
+            enum:
+            - Ok
       - type: object
         required:
-        - Drift
+        - kube_version
+        - expected_kube_version
+        - type
         properties:
-          Drift:
-            type: object
-            required:
-            - kube_version
-            - expected_kube_version
-            properties:
-              expected_kube_version:
-                type: string
-              kube_version:
-                type: string
-      - type: string
-        enum:
-        - Unknown
+          expected_kube_version:
+            type: string
+          kube_version:
+            type: string
+          type:
+            type: string
+            enum:
+            - Drift
+      - type: object
+        required:
+        - type
+        properties:
+          type:
+            type: string
+            enum:
+            - Unknown
     QoveryComponentContainerStatusIssue:
       type: object
       required:
@@ -1258,45 +1300,13 @@ components:
       - WARNING
     QoveryComponentInFailure:
       oneOf:
-      - type: object
-        required:
-        - POD_IN_ERROR
-        properties:
-          POD_IN_ERROR:
-            type: object
-            required:
-            - component_name
-            - pod_name
-            - container_name
-            - level
-            properties:
-              component_name:
-                type: string
-              container_name:
-                type: string
-              level:
-                $ref: '#/components/schemas/QoveryComponentContainerStatusLevel'
-              message:
-                type:
-                - string
-                - 'null'
-              pod_name:
-                type: string
-              reason:
-                type:
-                - string
-                - 'null'
-      - type: object
-        required:
-        - MISSING_COMPONENT
-        properties:
-          MISSING_COMPONENT:
-            type: object
-            required:
-            - component_name
-            properties:
-              component_name:
-                type: string
+      - $ref: '#/components/schemas/PodInErrorValue'
+      - $ref: '#/components/schemas/MissingComponentValue'
+      discriminator:
+        propertyName: type
+        mapping:
+          MISSING_COMPONENT: '#/components/schemas/MissingComponentValue'
+          POD_IN_ERROR: '#/components/schemas/PodInErrorValue'
     QoveryNodeFailure:
       type: object
       required: