@@ -25,7 +25,6 @@ https://www.youtube.com/playlist?list=PLGMB2PY4SNOr5pjbPTdcWsIrOezCPXWdX
 <iframe width="560" height="315" src="https://www.youtube.com/embed/SkrkvQew2X0" title="Experimental Mode" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 
 There is now an Experimental Mode in `odo` that can be enabled by exporting `ODO_EXPERIMENTAL_MODE=true` to your environment. All the new features will be generally available under this mode, giving you an opportunity to try them out sooner.
-Learn more about the experimental mode in [this doc](../docs/user-guides/advanced/experimental-mode).
 
 #### `odo dev` using Podman  ([#6151](https://github.com/redhat-developer/odo/pull/6151))
 <iframe width="560" height="315" src="https://www.youtube.com/embed/EmN_hGkOHX4?list=PLGMB2PY4SNOr5pjbPTdcWsIrOezCPXWdX" title="odo dev using podman" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 
@@ -50,7 +50,7 @@ Example:
 #### Using `odo` with Podman
 
 Based on your valuable feedback, we have worked on improving the experience of using `odo` with Podman.
-Note that this is still [experimental](../docs/user-guides/advanced/experimental-mode) and requires you to [opt in](../docs/user-guides/advanced/experimental-mode#enabling-the-experimental-mode) if you want to try it out.
+Note that this is still experimental and requires you to opt in if you want to try it out.
 
 - In [#6329](https://github.com/redhat-developer/odo/pull/6329), we have added labels to resources created by `odo` on Podman, so we can easily identify and use them. This adds the same labels depicted in [How odo works](../docs/development/architecture/how-odo-works#resource-labels).
 - With [#6366](https://github.com/redhat-developer/odo/pull/6366), `odo list component` is now able to list components running on Podman.
 
@@ -146,9 +146,8 @@ If you skipped Step 0 and selected "starter project", your output will be slight
 ### Step 2. Enabling the experimental mode
 
 Because the support for Podman is still experimental at the time of writing, we first need to explicitly opt-in.
-Find more details about the experimental mode on this [dedicated page](../../docs/user-guides/advanced/experimental-mode).
 
-[Enabling the experimental mode](../../docs/user-guides/advanced/experimental-mode#enabling-the-experimental-mode) can be done by setting the `ODO_EXPERIMENTAL_MODE` environment variable to `true` in the terminal session, like so:
+Enabling the experimental mode can be done by setting the `ODO_EXPERIMENTAL_MODE` environment variable to `true` in the terminal session, like so:
 
 ```console
 export ODO_EXPERIMENTAL_MODE=true
 
@@ -28,7 +28,7 @@ Similarly to how `odo dev` requires specifying the target platform (using the `-
 ODO_EXPERIMENTAL_MODE=t odo logs --platform podman
 ```
 
-As a reminder, Podman support in `odo` is still [experimental](../docs/user-guides/advanced/experimental-mode) and requires you to [opt in](../docs/user-guides/advanced/experimental-mode#enabling-the-experimental-mode) if you want to try it out.
+As a reminder, Podman support in `odo` is still experimental and requires you to opt in if you want to try it out.
 
 <iframe width="560" height="315" src="https://www.youtube.com/embed/K5GsDFEgCW0" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
 
 
@@ -5,8 +5,11 @@ toc_max_heading_level: 4
 ---
 
 `odo delete component` command is useful for deleting resources that are managed by `odo`.
-By default, it deletes the component and its related inner-loop, and outer-loop resources from the cluster.
-But the `running-in` flag allows to be more specific about which resources (either inner-loop or outer-loop) to delete.
+By default, it deletes the component and its related inner-loop, and outer-loop resources from the cluster and from podman.
+
+The `running-in` flag allows to be more specific about which resources (either inner-loop or outer-loop) to delete.
+
+The `platform` flag allows to restrict the deletion from a specific platform only, either cluster or podman.
 
 ## Running the command
 There are 2 ways to delete a component:
@@ -31,14 +34,16 @@ If these resources have been deployed on the cluster, then `odo` will delete the
 Otherwise, `odo` will exit with a message stating that it could not find the resources on the cluster.
 
 :::note
-If some resources attached to the component are present on the cluster, but not in the Devfile, then they will not be deleted.
+If some resources attached to the component are present on the cluster or on podman, but not in the Devfile, then they will not be deleted.
 You can delete these resources by running the command in the [next section](#delete-without-access-to-devfile).
 :::
 
 #### Filtering resources to delete
 You can specify the type of resources candidate for deletion via the `--running-in` flag.
 Acceptable values are `dev` (for inner-loop resources) or `deploy` (for outer-loop resources).
 
+You can target a specific platform from which delete the resources, with the `--platform` flag. Acceptable values are `cluster` and `podman`.
+
 <details>
 <summary>Example</summary>
 
@@ -91,16 +96,18 @@ import DeleteNamedComponentOutput from './docs-mdx/delete-component/delete_named
 </details>
 
 
-`odo` searches for resources attached to the given component in the given namespace on the cluster.
+`odo` searches for resources attached to the given component in the given namespace on the cluster and on Podman.
 If `odo` finds the resources, it will delete them after user confirmation.
-Otherwise, `odo` will exit with a message stating that it could not find the resources on the cluster.
+Otherwise, `odo` will exit with a message stating that it could not find the resources on the cluster or on Podman.
 
 `--namespace` is optional, if not provided, `odo` will use the current active namespace.
 
 #### Filtering resources to delete
 You can specify the type of resources candidate for deletion via the `--running-in` flag.
 Acceptable values are `dev` (for inner-loop resources) or `deploy` (for outer-loop resources).
 
+You can target a specific platform from which to delete the resources, with the `--platform` flag. Acceptable values are `cluster` and `podman`.
+
 <details>
 <summary>Example</summary>
 
 
@@ -2,7 +2,7 @@
 title: odo describe component
 ---
 
-`odo describe component` command is useful for getting information about a component managed by `odo`. 
+`odo describe component` command is useful for getting information about a component. 
 
 ## Running the command
 There are 2 ways to describe a component:
@@ -59,7 +59,7 @@ This command returns information extracted from the Devfile:
 - the list of Kubernetes components.
 - the list of forwarded ports if the component is running in Dev mode.
 
-The command also displays if the component is currently running in the cluster on Dev and/or Deploy mode.
+The command also displays if the component is currently running in the cluster or in Podman on Dev and/or Deploy mode.
 
 ### Describe without access to Devfile
 
@@ -98,4 +98,8 @@ Kubernetes Routes:
 
 The command extracts information from the labels and annotations attached to the deployed component to display the known metadata of the Devfile used to deploy the component.
 
-The command also displays if the component is currently running in the cluster on Dev and/or Deploy mode.
+The command also displays if the component is currently running in the cluster or in Podman on Dev and/or Deploy mode.
+
+### Targeting a specific platform
+
+By default, `odo describe component` will search components in both the current namespace of the cluster and podman. You can restrict the search to one of the platforms only, using the `--platform` flag, giving a value `cluster` or `podman`.
@@ -244,6 +244,43 @@ The following command will override the `USER` Devfile variable with the `john`
 odo dev --var USER=john --var-file config.vars
 ```
 
+### Running on Podman
+
+Instead of deploying the container into a Kubernetes cluster, `odo dev` can leverage the podman installation on your system to deploy the container.
+
+You need to use the `--platform podman` flags to run the component using podman instead of a Kubernetes cluster.
+
+```console
+odo dev --platform podman
+```
+<details>
+<summary>Example</summary>
+
+```console
+
+$ odo dev --platform podman
+  __
+ /  \__     Developing using the "my-nodejs-app" Devfile
+ \__/  \    Platform: podman
+ /  \__/    odo version: v3.7.0
+ \__/
+
+↪ Running on podman in Dev mode
+ ✓  Deploying pod [4s]
+ ✓  Building your application in container (command: install) [3s]
+ •  Executing the application (command: run)  ...
+ -  Forwarding from 127.0.0.1:20001 -> 3000
+
+↪ Dev mode
+ Status:
+ Watching for changes in the current directory /path/to/project/nodejs
+
+ Keyboard Commands:
+[Ctrl+c] - Exit and delete resources from podman
+     [p] - Manually apply local changes to the application on podman
+```
+</details>
+
 ## Devfile (Advanced Usage)
 
 ### Devfile Overview
 
@@ -1,5 +1,5 @@
 ```shell
-$ odo delete component --name my-nodejs --running-in deploy
+$ odo delete component --name my-nodejs --running-in deploy --platform cluster
 Searching resources to delete, please wait...
 This will delete "my-nodejs" from the namespace "my-project".
  •  The following resources will get deleted from cluster:
 
@@ -1,5 +1,5 @@
 ```shell
-$ odo delete component --running-in dev
+$ odo delete component --running-in dev --platform cluster
 Searching resources to delete, please wait...
 This will delete "my-nodejs" from the namespace "my-project".
  •  The following resources will get deleted from cluster:
 
@@ -2,7 +2,7 @@
 title: odo list component
 ---
 
-`odo list component` command is useful for getting information about components running on a specific namespace.
+`odo list component` command is useful for getting information about components running on a specific namespace of a cluster or on Podman.
 
 If the command is executed from a directory containing a Devfile, it also displays the component
 defined in the Devfile as part of the list, prefixed with a star(*).
@@ -12,7 +12,8 @@ For each component, the command displays:
 - its project type,
 - on which mode it is running (None, Dev, Deploy, or both), note that None is only applicable to the component 
 defined in the local Devfile,
-- by which application the component has been deployed.
+- by which application the component has been deployed,
+- the platform on which the component is running (cluster or podman).
 
 ### Running the command
 ```shell
@@ -24,13 +25,16 @@ odo list component
 ```shell
 $ odo list component
  ✓  Listing components from namespace 'my-percona-server-mongodb-operator' [292ms]
- NAME              PROJECT TYPE  RUNNING IN  MANAGED
- * my-nodejs         nodejs        Deploy      odo (v3.0.0-rc1)
- my-go-app         go            Dev         odo (v3.0.0-rc1)
- mongodb-instance  Unknown       None        percona-server-mongodb-operator 
+ NAME              PROJECT TYPE  RUNNING IN  MANAGED                          PLATFORM
+ * my-nodejs       nodejs        Deploy      odo (v3.7)                       cluster
+ my-go-app         go            Dev         odo (v3.7)                       podman
+ mongodb-instance  Unknown       None        percona-server-mongodb-operator  cluster
 ```
 </details>
 
+### Targeting a specific platform
+
+By default, `odo list component` will search components in both the current namespace of the cluster and podman. You can restrict the search to one of the platforms only, using the `--platform` flag, giving a value `cluster` or `podman`.
 
 :::tip use of cache