diff --git a/cli/Dockerfile b/cli/Dockerfile
index ff61c5b8c005ecff16090742c2aeffe2b8641c88..8b6ef31a0e4a3bb6820da36607a493e9a039b94e 100644
--- a/cli/Dockerfile
+++ b/cli/Dockerfile
@@ -83,6 +83,9 @@ RUN dnf install -y \
       procps-ng \
     && dnf clean all
 
+# Make koolbox self-aware
+COPY koolbox.dummy /usr/local/bin/koolbox
+
 # External tools
 COPY --from=terraform /bin/terraform /usr/local/bin/terraform
 COPY --from=packer /bin/packer /usr/local/bin/packer
diff --git a/cli/koolbox.dummy b/cli/koolbox.dummy
new file mode 100755
index 0000000000000000000000000000000000000000..0daad140edaff27567a4314f39ec503b036d4319
--- /dev/null
+++ b/cli/koolbox.dummy
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec $@