diff --git a/tests/camel-kamelets-itest/src/test/java/AwsIT.java b/tests/camel-kamelets-itest/src/test/java/AwsIT.java
index 5490ca0dd..ee67f5826 100644
--- a/tests/camel-kamelets-itest/src/test/java/AwsIT.java
+++ b/tests/camel-kamelets-itest/src/test/java/AwsIT.java
@@ -60,8 +60,28 @@ public SequenceAfterTest afterAws() {
     }
 
     @CitrusTestFactory
-    public Stream<DynamicTest> aws() {
-        return CitrusTestFactorySupport.factory(TestLoader.YAML).packageScan("aws");
+    public Stream<DynamicTest> awsS3() {
+        return CitrusTestFactorySupport.factory(TestLoader.YAML).packageScan("aws.s3");
+    }
+
+    @CitrusTestFactory
+    public Stream<DynamicTest> awsSqs() {
+        return CitrusTestFactorySupport.factory(TestLoader.YAML).packageScan("aws.sqs");
+    }
+
+    @CitrusTestFactory
+    public Stream<DynamicTest> awsDdb() {
+        return CitrusTestFactorySupport.factory(TestLoader.YAML).packageScan("aws.ddb");
+    }
+
+    @CitrusTestFactory
+    public Stream<DynamicTest> awsKinesis() {
+        return CitrusTestFactorySupport.factory(TestLoader.YAML).packageScan("aws.kinesis");
+    }
+
+    @CitrusTestFactory
+    public Stream<DynamicTest> awsEventBridge() {
+        return CitrusTestFactorySupport.factory(TestLoader.YAML).packageScan("aws.eventbridge");
     }
 
 }
diff --git a/tests/camel-kamelets-itest/src/test/resources-filtered/jbang.properties b/tests/camel-kamelets-itest/src/test/resources/avro/jbang.properties
similarity index 87%
rename from tests/camel-kamelets-itest/src/test/resources-filtered/jbang.properties
rename to tests/camel-kamelets-itest/src/test/resources/avro/jbang.properties
index caab22cef..7fd199d5d 100644
--- a/tests/camel-kamelets-itest/src/test/resources-filtered/jbang.properties
+++ b/tests/camel-kamelets-itest/src/test/resources/avro/jbang.properties
@@ -16,5 +16,4 @@
 #
 
 # Declare required additional dependencies
-run.deps=org.apache.camel:camel-jackson-avro:${camel.version},\
-org.apache.camel:camel-jackson-protobuf:${camel.version}
+run.deps=org.apache.camel:camel-jackson-avro:LATEST
diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.yaml b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.yaml
index bea0dd70d..dbc4f17c9 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.yaml
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.yaml
@@ -35,6 +35,7 @@ spec:
       properties:
         topicFormat: $[topic]_$[timestamp]
         timestampFormat: YYYY-MM-dd
+        timestampHeaderName: kafka.TIMESTAMP
         topicHeaderName: kafka.TOPIC
     - ref:
         kind: Kamelet
diff --git a/tests/camel-kamelets-itest/src/test/resources/protobuf/jbang.properties b/tests/camel-kamelets-itest/src/test/resources/protobuf/jbang.properties
new file mode 100644
index 000000000..4e7d7e462
--- /dev/null
+++ b/tests/camel-kamelets-itest/src/test/resources/protobuf/jbang.properties
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Declare required additional dependencies
+run.deps=org.apache.camel:camel-jackson-protobuf:LATEST