diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index dc61bf68..d1765282 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -54,4 +54,7 @@
 /stacks/ollama          @ibuziuk @manhah @devfile/che-team
 
 # JHipster stacks - On trial
-/stacks/jhipster-online/ @devfile/devfile-services-team @devfile/che-team
\ No newline at end of file
+/stacks/jhipster-online/ @devfile/devfile-services-team @devfile/che-team
+
+# Kaoto stacks
+/stacks/kaoto/ @devfile/devfile-services-team @devfile/che-team
\ No newline at end of file
diff --git a/stacks/kaoto/devfile.yaml b/stacks/kaoto/devfile.yaml
new file mode 100644
index 00000000..0f129424
--- /dev/null
+++ b/stacks/kaoto/devfile.yaml
@@ -0,0 +1,146 @@
+schemaVersion: 2.2.2
+metadata:
+  name: kaoto
+  version: 2.5.0
+  description: The Integration Designer for Apache Camel
+  displayName: Kaoto
+  icon: https://raw.githubusercontent.com/KaotoIO/kaoto/refs/heads/main/packages/ui/src/assets/logo-kaoto.svg
+  website: https://kaoto.io
+  tags:
+    - JavaScript
+    - React
+    - Quarkus
+    - Camel
+    - Podman
+  language: JavaScript
+  projectType: "Node.js"
+projects:
+  - name: kaoto
+    git:
+      remotes:
+        origin: 'https://github.com/KaotoIO/kaoto'
+      checkoutFrom:
+        revision: main
+components:
+  - name: tools
+    container:
+      image: quay.io/devfile/universal-developer-image@sha256:08cf567a02fa70043cad4c1bc6a98e04a7e3f108d2f145929bed80d248fd94fa
+      memoryLimit: 8Gi
+      memoryRequest: 1Gi
+      cpuLimit: "2"
+      cpuRequest: 200m
+      env:
+        - name: KUBEDOCK_PARAMS
+          value: "--reverse-proxy --kubeconfig /home/user/.kube/config --initimage quay.io/agiertli/kubedock:0.13.0"
+        - name: USE_JAVA17
+          value: "true"
+        - value: /home/jboss/.m2
+          name: MAVEN_CONFIG
+        - value: -Xmx4G -Xss128M -XX:MetaspaceSize=1G -XX:MaxMetaspaceSize=2G
+          name: MAVEN_OPTS
+        - name: KUBEDOCK_ENABLED
+          value: 'true'
+        - name: DOCKER_HOST
+          value: 'tcp://127.0.0.1:2475'
+        - name: TESTCONTAINERS_RYUK_DISABLED
+          value: 'true'
+        - name: TESTCONTAINERS_CHECKS_DISABLE
+          value: 'true'
+      endpoints:
+        - exposure: none
+          name: kubedock
+          protocol: tcp
+          targetPort: 2475
+        - exposure: public
+          name: kaoto-podman
+          protocol: https
+          targetPort: 8080
+          attributes:
+            discoverable: true
+            urlRewriteSupported: true
+        - exposure: public
+          name: kaoto
+          protocol: https
+          targetPort: 4173
+          attributes:
+            discoverable: true
+            urlRewriteSupported: true
+        - exposure: internal
+          name: debug
+          protocol: http
+          targetPort: 5005
+      volumeMounts:
+        - name: m2
+          path: /home/user/.m2
+        - name: npm
+          path: /home/user/.npm
+  - name: m2
+    volume:
+      size: 512Mi
+  - name: npm
+    volume:
+      size: 512Mi
+commands:
+  - id: yarn-install
+    exec:
+      label: '1. Install Dependencies'
+      component: tools
+      workingDir: ${PROJECT_SOURCE}
+      commandLine: 'yarn install'
+      group:
+        kind: build
+        isDefault: true
+  - id: build-camel-catalog-supporting-schemas
+    exec:
+      label: '2. Build the Camel Catalog and the supporting schemas'
+      component: tools
+      workingDir: ${PROJECT_SOURCE}
+      commandLine: 'yarn workspace @kaoto/camel-catalog run build'
+      group:
+        kind: build
+        isDefault: false
+  - id: build
+    exec:
+      label: '3. Build'
+      component: tools
+      workingDir: ${PROJECT_SOURCE}
+      commandLine: 'yarn workspace @kaoto/kaoto run build'
+      group:
+        kind: build
+        isDefault: false
+  - id: start-development-server
+    exec:
+      label: '4. Start the development server'
+      component: tools
+      workingDir: ${PROJECT_SOURCE}
+      commandLine: 'yarn workspace @kaoto/kaoto run start --host'
+      group:
+        kind: run
+        isDefault: true
+  - id: build-public-componets
+    exec:
+      label: '(optional). Build the public components'
+      component: tools
+      workingDir: ${PROJECT_SOURCE}
+      commandLine: 'yarn workspace @kaoto/kaoto run build:lib'
+      group:
+        kind: build
+        isDefault: false
+  - id: start-storybook
+    exec:
+      label: '(optional). Run the storybook'
+      component: tools
+      workingDir: ${PROJECT_SOURCE}
+      commandLine: 'yarn workspace @kaoto/kaoto-tests storybook'
+      group:
+        kind: run
+        isDefault: false
+  - id: start-with-docker
+    exec:
+      label: '(optional). Running kaoto with Podman'
+      component: tools
+      workingDir: ${PROJECT_SOURCE}
+      commandLine: 'podman run --rm -p 8080:8080 --name kaoto quay.io/kaotoio/kaoto-app:main'
+      group:
+        kind: run
+        isDefault: false
diff --git a/tests/check_odov3.sh b/tests/check_odov3.sh
index c502e943..970121e9 100755
--- a/tests/check_odov3.sh
+++ b/tests/check_odov3.sh
@@ -55,6 +55,7 @@ ginkgo run --procs 2 \
   --skip="stack: java-vertx version: 1.4.0 starter: vertx-messaging-work-queue-booster" \
   --skip="stack: java-websphereliberty-gradle version: 0.4.0 starter: rest" \
   --skip="stack: jhipster-online" \
+  --skip="stack: kaoto" \
   --skip="stack: java-wildfly-bootable-jar" \
   --skip="stack: java-wildfly" \
   --skip="stack: java-openliberty" \