diff --git a/src/openapi.yaml b/src/openapi.yaml
index 99ec3b94..f128c291 100644
--- a/src/openapi.yaml
+++ b/src/openapi.yaml
@@ -406,6 +406,12 @@ paths:
     $ref: './resources/ContainerRegistryContainerStatus.yaml'
   /availableContainerRegistry:
     $ref: './resources/AvailableContainerRegistry.yaml'
+  /availableHelmRepository:
+    $ref: './resources/AvailableHelmRepository.yaml'
+  /organization/{organizationId}/helmRepository:
+    $ref: './resources/OrganizationHelmRepository.yaml'
+  /organization/{organizationId}/helmRepository/{helmRepositoryId}:
+    $ref: './resources/OrganizationHelmRepositoryRef.yaml'
   /project/{projectId}:
     $ref: './resources/Project.yaml'
   /project/{projectId}/deploymentRule:
diff --git a/src/parameters/path/helmRepositoryId.yaml b/src/parameters/path/helmRepositoryId.yaml
new file mode 100644
index 00000000..5ef8c822
--- /dev/null
+++ b/src/parameters/path/helmRepositoryId.yaml
@@ -0,0 +1,7 @@
+name: helmRepositoryId
+in: path
+description: Helm chart repository ID
+required: true
+schema:
+  type: string
+  format: uuid
diff --git a/src/schemas/helm/HelmResponse.yaml b/src/schemas/helm/HelmResponse.yaml
index 9f60260c..91ca6200 100644
--- a/src/schemas/helm/HelmResponse.yaml
+++ b/src/schemas/helm/HelmResponse.yaml
@@ -27,37 +27,39 @@ allOf:
         description: |
           Specify if the service will be automatically updated after receiving a new image tag or a new commit according to the source type. 
       source:
-        type: object
-        properties:
-          git:
-            type: object
-            nullable: true
+        nullable: false
+        oneOf:
+          - type: object
             properties:
-              git_repository:
-                $ref: '../ApplicationGitRepositoryRequest.yaml'
-          repository:
-            type: object
-            nullable: true
+              git:
+                type: object
+                properties:
+                  git_repository:
+                    $ref: '../ApplicationGitRepositoryRequest.yaml'
+          - type: object
             properties:
-              chart_name:
-                type: string
-                description: The name of the chart in the repository
-              chart_version:
-                type: string
-                description: The version of the chart to use
               repository:
                 type: object
                 properties:
-                  id:
-                    type: string
-                    format: UUID
-                    description: The id of the helm repository
-                  name:
+                  chart_name:
                     type: string
-                    description: The name of the helm repository
-                  url:
+                    description: The name of the chart in the repository
+                  chart_version:
                     type: string
-                    description: The url the helm repository
+                    description: The version of the chart to use
+                  repository:
+                    type: object
+                    properties:
+                      id:
+                        type: string
+                        format: UUID
+                        description: The id of the helm repository
+                      name:
+                        type: string
+                        description: The name of the helm repository
+                      url:
+                        type: string
+                        description: The url the helm repository
       arguments:
         type: array
         description: The extra arguments to pass to helm
@@ -93,32 +95,32 @@ allOf:
               items:
                 type: string
           file:
-            type: object
-            nullable: true
-            properties:
-              raw:
-                type: object
-                nullable: true
+            oneOf:
+              - type: object
                 properties:
-                  values:
-                    type: array
-                    items:
-                      type: object
-                      properties:
-                        name:
-                          type: string
-                          description: The name of the value file
-                        content:
-                          type: string
-                          description: The content of the value file
-              git:
-                type: object
-                nullable: true
+                  raw:
+                    type: object
+                    properties:
+                      values:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            name:
+                              type: string
+                              description: The name of the value file
+                            content:
+                              type: string
+                              description: The content of the value file
+              - type: object
                 properties:
-                  git_repository:
-                    $ref: '../ApplicationGitRepositoryRequest.yaml'
-                  paths:
-                    type: array
-                    description: List of path inside your git repository to locate values file. Must start by a /
-                    items:
-                      type: string
+                  git:
+                    type: object
+                    properties:
+                      git_repository:
+                        $ref: '../ApplicationGitRepositoryRequest.yaml'
+                      paths:
+                        type: array
+                        description: List of path inside your git repository to locate values file. Must start by a /
+                        items:
+                          type: string