diff --git a/kamelet-chucknorris/README.adoc b/kamelet-chucknorris/README.adoc
index fd8796891..b05d2d934 100644
--- a/kamelet-chucknorris/README.adoc
+++ b/kamelet-chucknorris/README.adoc
@@ -2,13 +2,23 @@
 
 === Introduction
 
-This example shows how you can build a simple Kamelet and use with your Camel applications.
+This example shows how to use an official Kamelet from the
+https://camel.apache.org/camel-kamelets/next/[Kamelets Catalog]
+in a traditional Maven-based Camel application.
 
-The Kamelet is created as a YAML file in the `src/main/resources/kamelets' directory.
-We have developed a Chuck Norris Kamelet that periodically gets a joke from the Chuck Norris internet database.
+The example uses the
+https://camel.apache.org/camel-kamelets/next/chuck-norris-source.html[Chuck Norris Source]
+Kamelet which periodically gets a joke from the Chuck Norris internet database.
 
-A Camel routes is _coded_ in the `my-route.xml` file using the XML DSL that uses the Kamelet,
-and log the result from the Kamelet to the console.
+The official Kamelets are included as a Maven dependency by adding the `camel-kamelets`
+JAR to the `pom.xml`. Kamelets are then auto-discovered from the classpath at runtime.
+
+NOTE: The `camel-kamelets` JAR only contains the Kamelet YAML definitions. You must also
+add the Camel component dependencies that the Kamelet uses internally
+(e.g. `camel-timer`, `camel-http`, `camel-jsonpath` for the Chuck Norris Kamelet).
+
+The Camel route is defined in `my-route.camel.yaml` using the YAML DSL and logs
+the joke to the console.
 
 === Build
 
diff --git a/kamelet-chucknorris/pom.xml b/kamelet-chucknorris/pom.xml
index d392469fb..bfcb36427 100644
--- a/kamelet-chucknorris/pom.xml
+++ b/kamelet-chucknorris/pom.xml
@@ -31,7 +31,7 @@
     <artifactId>camel-example-kamelet-chucknorris</artifactId>
     <packaging>jar</packaging>
     <name>Camel :: Example :: Kamelet :: Chuck Norris</name>
-    <description>How easy it is to create your own Kamelets</description>
+    <description>How easy it is to use a Kamelet in your Camel application</description>
 
     <properties>
         <category>Kamelet</category>
@@ -47,20 +47,39 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.apache.camel.kamelets</groupId>
+                <artifactId>camel-kamelets</artifactId>
+                <version>${camel-kamelets-catalog-version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
 
-        <!-- main to easily run with Kamelets -->
+        <!-- main dependencies -->
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-kamelet-main</artifactId>
+            <artifactId>camel-core</artifactId>
         </dependency>
-        <!-- to use XML DSL -->
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-xml-io-dsl</artifactId>
+            <artifactId>camel-main</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-kamelet</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel.kamelets</groupId>
+            <artifactId>camel-kamelets</artifactId>
+        </dependency>
+
+        <!-- to use YAML DSL for route definitions -->
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-yaml-dsl</artifactId>
         </dependency>
 
         <!-- these dependencies are used by the kamelet -->
@@ -90,6 +109,7 @@
             <version>${log4j2-version}</version>
             <scope>runtime</scope>
         </dependency>
+
         <!-- for testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
@@ -105,6 +125,10 @@
                 <groupId>org.apache.camel</groupId>
                 <artifactId>camel-maven-plugin</artifactId>
                 <version>${camel.version}</version>
+                <configuration>
+                    <logClasspath>false</logClasspath>
+                    <mainClass>org.apache.camel.example.MyApplication</mainClass>
+                </configuration>
             </plugin>
         </plugins>
     </build>
diff --git a/kamelet-chucknorris/src/main/resources/application.properties b/kamelet-chucknorris/src/main/resources/application.properties
index 8945f00bf..b33a1fa3a 100644
--- a/kamelet-chucknorris/src/main/resources/application.properties
+++ b/kamelet-chucknorris/src/main/resources/application.properties
@@ -19,6 +19,10 @@
 # https://camel.apache.org/components/next/others/main.html
 camel.main.name = MyKameletCamel
 
-# routes to load
-camel.main.routes-include-pattern = camel/*.xml
+# routes to load, not needed here as routes from classpath:camel/* are
+# automatically loaded
+# camel.main.routes-include-pattern = camel/*.yaml
+
+# configure the period of the Chuck Norris Source Kamelet
+camel.kamelet.chuck-norris-source.period=60000
 
diff --git a/kamelet-chucknorris/src/main/resources/camel/my-route.camel.yaml b/kamelet-chucknorris/src/main/resources/camel/my-route.camel.yaml
new file mode 100644
index 000000000..85edcc953
--- /dev/null
+++ b/kamelet-chucknorris/src/main/resources/camel/my-route.camel.yaml
@@ -0,0 +1,5 @@
+- route:
+    from:
+      uri: kamelet:chuck-norris-source
+      steps:
+        - log: "${body}"
diff --git a/kamelet-chucknorris/src/main/resources/camel/my-route.xml b/kamelet-chucknorris/src/main/resources/camel/my-route.xml
deleted file mode 100644
index 3db4a3654..000000000
--- a/kamelet-chucknorris/src/main/resources/camel/my-route.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<routes xmlns="http://camel.apache.org/schema/spring">
-    <route>
-        <from uri="kamelet:chuck-norris-source"/>
-        <log message="${body}"/>
-    </route>
-</routes>
\ No newline at end of file
diff --git a/kamelet-chucknorris/src/main/resources/kamelets/chuck-norris-source.kamelet.yaml b/kamelet-chucknorris/src/main/resources/kamelets/chuck-norris-source.kamelet.yaml
deleted file mode 100644
index 937f06f5f..000000000
--- a/kamelet-chucknorris/src/main/resources/kamelets/chuck-norris-source.kamelet.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-apiVersion: camel.apache.org/v1
-kind: Kamelet
-metadata:
-  name: chuck-norris-source
-  annotations:
-    camel.apache.org/kamelet.support.level: "Preview"
-    camel.apache.org/catalog.version: "main-SNAPSHOT"
-    camel.apache.org/kamelet.icon: data:image/svg+xml;base64,<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
<rect x="165.47" y="243.8" style="fill:#F0F0FA;" width="129.65" height="41.2"/>
<g>
	<rect x="403.12" y="199.67" style="fill:#FFB487;" width="32" height="42"/>
	<rect x="210.12" y="203.96" style="fill:#FFB487;" width="32" height="42"/>
</g>
<g>
	<path style="fill:#F0F0FA;" d="M242.956,196l-57.833-90h-21.177c-19.435,0-36.523,12.867-41.894,31.545l-23.095,80.319
		C93.465,236.962,107.8,256,127.672,256h82.451v-60h-52"/>
	<path style="fill:#F0F0FA;" d="M226.504,170.398L260.123,106h17.129c16.484,0,31.558,9.298,38.956,24.029l22.094,43.997
		c3.686,7.34,11.197,11.973,19.411,11.973h45.411v70.127H282.11"/>
</g>
<polygon style="fill:#BEBEBE;" points="226.504,170.398 185.123,106 258.845,106 "/>
<g>
	<path style="fill:#D7D7E6;" d="M165.474,285l-55.695,32.347c-23.501,13.649-41.2,35.42-49.765,61.212L32.306,462h93l35-78
		L165.474,285z"/>
	<path style="fill:#D7D7E6;" d="M295.123,285l55.695,32.347c23.501,13.649,41.2,35.42,49.765,61.212L428.291,462h-93l-35-78
		L295.123,285z"/>
</g>
<g>
	<path style="fill:#BEBEBE;" d="M22.877,502h77.987c8.284,0,15-6.716,15-15v-25H62.877C40.786,462,22.877,479.909,22.877,502
		L22.877,502z"/>
	<path style="fill:#BEBEBE;" d="M437.719,502h-77.987c-8.284,0-15-6.716-15-15v-25h52.987C419.81,462,437.719,479.909,437.719,502
		L437.719,502z"/>
</g>
<g>
	<path style="fill:#FFCDAC;" d="M226.504,106L226.504,106c-24.301,0-44-19.699-44-44v-8c0-24.301,19.699-44,44-44l0,0
		c24.301,0,44,19.699,44,44v8C270.504,86.301,250.805,106,226.504,106z"/>
	<path style="fill:#FFCDAC;" d="M470.123,251.833h-16c-10.493,0-19-8.507-19-19V208.5c0-10.493,8.507-19,19-19h16
		c10.493,0,19,8.507,19,19v24.333C489.123,243.327,480.616,251.833,470.123,251.833z"/>
	<path style="fill:#FFCDAC;" d="M277.123,256.127h-16c-10.493,0-19-8.507-19-19v-24.333c0-10.493,8.507-19,19-19h16
		c10.493,0,19,8.507,19,19v24.333C296.123,247.62,287.616,256.127,277.123,256.127z"/>
</g>
<polygon style="fill:#F0F0FA;" points="134.474,384 165.474,285 295.123,285 326.123,384 "/>
<path d="M251.7,334c-2.63,0-5.21,1.07-7.07,2.93c-1.86,1.86-2.93,4.44-2.93,7.07s1.07,5.21,2.93,7.07s4.44,2.93,7.07,2.93
	s5.21-1.07,7.07-2.93s2.93-4.44,2.93-7.07s-1.06-5.21-2.93-7.07C256.91,335.07,254.33,334,251.7,334z"/>
<path d="M397.439,369.066c-5.243,1.736-8.085,7.394-6.35,12.637l0.148,0.447c1.391,4.2,5.297,6.859,9.492,6.859
	c1.042,0,2.102-0.165,3.145-0.51c5.243-1.736,8.085-7.394,6.35-12.637l-0.148-0.447C408.34,370.172,402.682,367.331,397.439,369.066
	z"/>
<path d="M470.123,179.5h-16c-8.806,0-16.702,3.951-22.025,10.167h-18.975V186c0-5.523-4.477-10-10-10h-45.411
	c-4.459,0-8.473-2.476-10.475-6.461l-22.094-43.997C315.993,107.32,297.642,96,277.251,96h-8.835
	c7.551-9.29,12.087-21.123,12.087-34v-8c0-29.776-24.224-54-54-54s-54,24.224-54,54v8c0,12.877,4.537,24.71,12.088,34h-20.646
	c-23.759,0-44.938,15.948-51.504,38.781L89.346,215.1c-3.494,12.149-1.136,24.91,6.468,35.008
	c7.605,10.1,19.217,15.892,31.858,15.892h27.801v13.243L104.756,308.7c-25.631,14.887-44.892,38.578-54.232,66.708l-27.708,83.441
	c-1.013,3.049-0.499,6.398,1.381,9.003c0.325,0.451,0.695,0.857,1.083,1.241c-7.712,8.801-12.403,20.313-12.403,32.907
	c0,5.523,4.477,10,10,10h77.987c13.785,0,25-11.215,25-25v-15.041c3.713-0.209,7.029-2.444,8.564-5.865L166.779,394h127.038
	l32.35,72.094c1.535,3.421,4.851,5.656,8.564,5.865V487c0,1.712,0.174,3.384,0.503,5h-83.533c-5.523,0-10,4.477-10,10
	s4.477,10,10,10h186.018c5.523,0,10-4.477,10-10c0-12.594-4.69-24.107-12.403-32.907c0.388-0.385,0.758-0.791,1.083-1.241
	c1.88-2.605,2.394-5.954,1.381-9.003l-16.805-50.606c-1.74-5.241-7.397-8.08-12.642-6.339c-5.242,1.74-8.08,7.4-6.339,12.642
	L414.433,452h-16.714h-52.988h-2.967l-26.026-58h10.385c3.182,0,6.174-1.515,8.059-4.079s2.436-5.873,1.484-8.909l-23.309-74.438
	l33.439,19.421c12.741,7.4,23.919,17.706,32.328,29.802c1.943,2.795,5.056,4.293,8.22,4.293c1.969,0,3.959-0.581,5.699-1.79
	c4.535-3.152,5.656-9.384,2.504-13.919c-10.067-14.483-23.452-26.822-38.706-35.682l-50.718-29.456v-13.116h98
	c5.523,0,10-4.477,10-10v-4.46h18.974c5.323,6.216,13.219,10.167,22.026,10.167h16c15.991,0,29-13.009,29-29V208.5
	C499.123,192.509,486.113,179.5,470.123,179.5z M397.719,472c13.038,0,24.159,8.359,28.287,20h-66.274c-2.757,0-5-2.243-5-5v-15
	H397.719z M286.123,237.127c0,4.962-4.038,9-9,9h-16c-4.962,0-9-4.038-9-9v-24.333c0-4.962,4.038-9,9-9h16c4.962,0,9,4.038,9,9
	V237.127z M220.123,213.96h12v22h-12V213.96z M198.32,108.04c8.21,5.045,17.862,7.96,28.185,7.96c6.648,0,13.017-1.215,18.904-3.423
	l-19.8,37.928L198.32,108.04z M192.504,54c0-18.748,15.252-34,34-34c18.748,0,34,15.252,34,34v8c0,18.748-15.252,34-34,34l0,0
	c-18.748,0-34-15.252-34-34V54z M111.792,238.079c-3.791-5.034-4.966-11.395-3.225-17.451l23.096-80.32
	c4.115-14.312,17.39-24.308,32.283-24.308h15.716l50.097,77.96h-9.846c-0.942-4.545-4.967-7.96-9.791-7.96h-52
	c-5.523,0-10,4.477-10,10s4.477,10,10,10h42v39.96V246h-72.45C121.371,246,115.583,243.113,111.792,238.079z M105.865,487
	c0,2.757-2.243,5-5,5H34.591c4.127-11.641,15.249-20,28.287-20h42.987V487z M118.832,452h-2.967H62.877H46.163l23.341-70.29
	c7.802-23.495,23.889-43.282,45.297-55.716l33.439-19.421l-23.309,74.438c-0.951,3.037-0.4,6.345,1.484,8.909
	c1.884,2.564,4.876,4.079,8.059,4.079h10.384L118.832,452z M148.084,374l6.263-20h58.1c5.523,0,10-4.477,10-10s-4.477-10-10-10
	h-51.838l12.212-39h114.954l24.738,79H148.084z M285.123,275H175.474v-9h34.649c5.523,0,10-4.477,10-10v-0.04h18.975
	c5.323,6.216,13.219,10.167,22.025,10.167h16c1.067,0,2.12-0.062,3.157-0.175c0.594,0.11,1.205,0.175,1.831,0.175h3.012L285.123,275
	L285.123,275z M393.123,246.127h-88.437c0.928-2.835,1.437-5.859,1.437-9v-24.333c0-15.991-13.009-29-29-29h-16
	c-4.414,0-8.598,0.995-12.346,2.767l-10.72-16.683L266.183,116h11.069c12.781,0,24.283,7.095,30.019,18.517l22.094,43.997
	C334.78,189.3,345.643,196,357.712,196h35.411v3.667v42L393.123,246.127L393.123,246.127z M413.123,209.667h12v22h-12V209.667z
	 M479.123,232.833c0,4.962-4.038,9-9,9h-16c-4.962,0-9-4.038-9-9V208.5c0-4.962,4.038-9,9-9h16c4.962,0,9,4.038,9,9V232.833z"/>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>

-    camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/kamelet.group: "Chuck Norris"
-  labels:
-    camel.apache.org/kamelet.type: "source"
-spec:
-  definition:
-    title: "Chuck Norris Source"
-    description: |-
-      Gets peridically Chuck Norris jokes from http://www.icndb.com/
-    type: object
-    properties:
-      period:
-        title: Period
-        description: The interval (msec) to wait before getting the next joke
-        type: integer
-        default: 10000
-  types:
-    out:
-      mediaType: text/plain
-  dependencies:
-    - "camel:kamelet"
-    - "camel:timer"
-    - "camel:http"
-    - "camel:jsonpath"
-  template:
-    from:
-      uri: "timer:chuck"
-      parameters:
-        period: "{{period}}"
-      steps:
-        - to: "https://api.chucknorris.io/jokes/random"
-        - setBody:
-            jsonpath: "$.value"
-        - to: "kamelet:sink"
diff --git a/kamelet-chucknorris/src/main/resources/log4j2.properties b/kamelet-chucknorris/src/main/resources/log4j2.properties
index d9f0508a6..c0147f854 100644
--- a/kamelet-chucknorris/src/main/resources/log4j2.properties
+++ b/kamelet-chucknorris/src/main/resources/log4j2.properties
@@ -18,6 +18,6 @@
 appender.out.type = Console
 appender.out.name = out
 appender.out.layout.type = PatternLayout
-appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n
+appender.out.layout.pattern = %d [%20.20t] %-20.20c{1} %-5p %m%n
 rootLogger.level = INFO
 rootLogger.appenderRef.out.ref = out
diff --git a/kamelet-chucknorris/src/test/java/org/apache/camel/example/KameletChuckNorrisTest.java b/kamelet-chucknorris/src/test/java/org/apache/camel/example/KameletChuckNorrisTest.java
index 43ed238ee..dea1ca735 100644
--- a/kamelet-chucknorris/src/test/java/org/apache/camel/example/KameletChuckNorrisTest.java
+++ b/kamelet-chucknorris/src/test/java/org/apache/camel/example/KameletChuckNorrisTest.java
@@ -40,6 +40,6 @@ void should_use_a_simple_kamelet() {
 
     @Override
     protected void configure(MainConfigurationProperties configuration) {
-        configuration.withRoutesIncludePattern("camel/*");
+        configuration.withRoutesIncludePattern("camel/*.yaml");
     }
 }