diff --git a/Containerfile.rhtap b/Containerfile.rhtap
index 8d4a14c4..c4d0fb28 100755
--- a/Containerfile.rhtap
+++ b/Containerfile.rhtap
@@ -6,7 +6,8 @@ COPY . $SOURCE_DIR
 
 ENV GOEXPERIMENT=strictfipsruntime
 ENV CGO_ENABLED=1
-RUN make binary BUILD_OPTS="-tags strictfipsruntime"
+# Note: kafka tag is required
+RUN make binary BUILD_OPTS="-tags strictfipsruntime,kafka"
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
 
diff --git a/Dockerfile b/Dockerfile
index cd32cb00..aadbe558 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR $SOURCE_DIR
 COPY . $SOURCE_DIR
 
 ENV GOFLAGS=""
-RUN make binary
+RUN make binary BUILD_OPTS="-tags kafka"
 
 FROM registry.access.redhat.com/ubi9/ubi-minimal:latest