diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..e660fd93d
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+bin/
diff --git a/Makefile b/Makefile
index 9e4975e6c..f2743e770 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ tests-unit: validate_go ## Unit tests
 
 .PHONY: tests-e2e
 tests-e2e: validate_go $(KIND)  ## End-to-end tests
-	go test -p 1 -v -timeout 1200s -race $$(go list ./... | grep  /e2e)
+	go test -p 1 -v -timeout 20m -race $$(go list ./... | grep  /e2e)
 
 .PHONY: tests-all
 tests-all: validate_go tests-unit tests-e2e ## All tests
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index 4e5ac1198..798527df0 100644
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -17,12 +17,12 @@ RUN git status --porcelain
 RUN make build_code
 
 # final stage
-FROM ubuntu
-RUN apt-get update && apt-get install -y \
-  netbase \
+FROM registry.access.redhat.com/ubi8/ubi-minimal
+RUN microdnf install -y \
+  iputils \
   curl \
   net-tools \
-  && rm -rf /var/lib/apt/lists/*
+  && microdnf -y clean all  && rm -rf /var/cache
 
 COPY --from=builder /app/flowlogs-pipeline /app/
 COPY --from=builder /app/confgenerator /app/
@@ -30,4 +30,4 @@ COPY --from=builder /app/confgenerator /app/
 # expose ports
 EXPOSE 2055
 
-ENTRYPOINT ["/app/flowlogs-pipeline"]
\ No newline at end of file
+ENTRYPOINT ["/app/flowlogs-pipeline"]