diff --git a/quarkus-kafaka-homework/docker-resources/docker-compose.yaml b/quarkus-kafaka-homework/docker-resources/docker-compose.yaml
index d45bf58..159f91c 100644
--- a/quarkus-kafaka-homework/docker-resources/docker-compose.yaml
+++ b/quarkus-kafaka-homework/docker-resources/docker-compose.yaml
@@ -37,7 +37,7 @@ services:
     image: strimzi/kafka:0.11.3-kafka-2.1.0
     command: [
         "sh", "-c",
-        "bin/kafka-console-consumer.sh --bootstrap-server kafka:2091 --topic timestamp --topic user-message --from-beginning"
+        "bin/kafka-console-consumer.sh --bootstrap-server kafka:2091 --whitelist 'timestamp|user-message' --from-beginning"
     ]
     depends_on:
       - kafka
diff --git a/quarkus-kafaka-homework/kafka-consumer/pom.xml b/quarkus-kafaka-homework/kafka-consumer/pom.xml
index 9b41c26..5dd9658 100644
--- a/quarkus-kafaka-homework/kafka-consumer/pom.xml
+++ b/quarkus-kafaka-homework/kafka-consumer/pom.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-        <groupId>me.jochirst.kafka</groupId>
-        <artifactId>kafka-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+    <groupId>me.jochirst.kafka</groupId>
+    <artifactId>kafka-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>kafka-consumer</artifactId>
   <properties>
@@ -68,6 +68,10 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-smallrye-openapi</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-container-image-jib</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/quarkus-kafaka-homework/kafka-consumer/src/main/resources/application.properties b/quarkus-kafaka-homework/kafka-consumer/src/main/resources/application.properties
index d6acfce..9a302b3 100644
--- a/quarkus-kafaka-homework/kafka-consumer/src/main/resources/application.properties
+++ b/quarkus-kafaka-homework/kafka-consumer/src/main/resources/application.properties
@@ -6,6 +6,7 @@ kafka.bootstrap.servers=kafka-cluster-kafka-bootstrap:9092
 %dev.kafka.bootstrap.servers=localhost:9092
 %dev.quarkus.http.port=8081
 quarkus.http.port=8080
+
 mp.messaging.incoming.user-message.connector=smallrye-kafka
 mp.messaging.incoming.user-message.topic=user-message
 mp.messaging.incoming.user-message.value.deserializer=org.apache.kafka.common.serialization.StringDeserializer
diff --git a/quarkus-kafaka-homework/kafka-producer/pom.xml b/quarkus-kafaka-homework/kafka-producer/pom.xml
index 0fe756f..02d6cac 100644
--- a/quarkus-kafaka-homework/kafka-producer/pom.xml
+++ b/quarkus-kafaka-homework/kafka-producer/pom.xml
@@ -63,7 +63,11 @@
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-smallrye-openapi</artifactId>
     </dependency>
-  </dependencies>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-container-image-jib</artifactId>
+    </dependency>
+</dependencies>
   <build>
     <plugins>
       <plugin>
diff --git a/quarkus-kafaka-homework/kafka-producer/src/main/resources/application.properties b/quarkus-kafaka-homework/kafka-producer/src/main/resources/application.properties
index 792b898..54b7dcb 100644
--- a/quarkus-kafaka-homework/kafka-producer/src/main/resources/application.properties
+++ b/quarkus-kafaka-homework/kafka-producer/src/main/resources/application.properties
@@ -6,7 +6,7 @@ kafka.bootstrap.servers=kafka-cluster-kafka-bootstrap:9092
 %dev.quarkus.http.port=8080
 quarkus.http.port=8080
 quarkus.swagger-ui.always-include=true
-
+quarkus.openshift.expose=true
 
 # Configure the Kafka sink (we write to it)
 mp.messaging.outgoing.timestamp.connector=smallrye-kafka
diff --git a/quarkus-kafaka-homework/pom.xml b/quarkus-kafaka-homework/pom.xml
index 94772fd..3bb268b 100644
--- a/quarkus-kafaka-homework/pom.xml
+++ b/quarkus-kafaka-homework/pom.xml
@@ -26,7 +26,8 @@
      <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
      <quarkus.platform.version>1.8.1.Final</quarkus.platform.version>
      <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
-  </properties>
+     <quarkus.container-image.builder>s2i</quarkus.container-image.builder>
+ </properties>
 
   <!--
   For kafka deployments lets skip 'em as default