diff --git a/images/koolbox/Dockerfile b/images/koolbox/Dockerfile
index 0707d637cd71e4467928ae5ae3e04487f4f0fdde..9c76eafc8f990d201bfba0efe9039ea0dd74b340 100644
--- a/images/koolbox/Dockerfile
+++ b/images/koolbox/Dockerfile
@@ -120,6 +120,8 @@ RUN curl -L "https://github.com/rust-lang/mdBook/releases/download/${MDBOOK_VERS
 # Terraform CLI
 FROM docker.io/hashicorp/terraform:1.5.3 AS terraform
 
+FROM quay.io/shivering-isles/opentf:0.1.0 as opentf
+
 # Actual start of container build
 FROM quay.io/fedora/fedora:38
 
@@ -167,7 +169,7 @@ COPY --from=mdbook /usr/local/bin/mdbook /usr/local/bin/mdbook
 COPY --from=release-cli /usr/local/bin/release-cli /usr/local/bin/release-cli
 COPY --from=git-chglog /usr/local/bin/git-chglog /usr/local/bin/git-chglog
 COPY --from=svu /usr/bin/svu /usr/local/bin/svu
-COPY --from=terraform /bin/terraform /usr/local/bin/terraform
+COPY --from=opentf /usr/local/bin/opentf /usr/local/bin/opentf
 
 RUN true \
     && echo "command -v kubectl-krew >/dev/null && export PATH=\"${KREW_ROOT:-$HOME/.krew}/bin:$PATH\"" >> /root/.bashrc \
@@ -176,6 +178,7 @@ RUN true \
     && echo "command -v kubectl >/dev/null && . <(kubectl completion bash)" >> /root/.bashrc \
     && echo "command -v helm >/dev/null && . <(helm completion bash)" >> /root/.bashrc \
     && echo "command -v mdbook >/dev/null && . <(mdbook completions bash)" >> /root/.bashrc \
+    && ln -s /usr/local/bin/opentf /usr/local/bin/terraform \
     && true
 
 RUN true \