diff --git a/cli/Dockerfile b/cli/Dockerfile
index 66d9b1df0d88459a82913a315554287dd083d700..36f60c3492f94fdd8baae1b24fcfe2f9314d87cf 100644
--- a/cli/Dockerfile
+++ b/cli/Dockerfile
@@ -1,9 +1,5 @@
-FROM docker.io/hashicorp/terraform:1.0.0 AS terraform
-FROM docker.io/hashicorp/packer:1.7.3 AS packer
-
-
 # kubectl CLI cache
-FROM docker.io/library/fedora:34 as kubectl
+FROM docker.io/library/fedora:35 as kubectl
 
 ARG KUBECTL_RELEASE=v1.22.0
 ENV KUBECTL_RELEASE=${KUBECTL_RELEASE}
@@ -17,17 +13,8 @@ RUN curl -LO "https://dl.k8s.io/release/${KUBECTL_RELEASE}/bin/linux/amd64/kubec
     && install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl \
     && install -o root -g root -m 0755 kubectl-convert /usr/local/bin/kubectl-convert
 
-# hcloud CLI cache
-FROM docker.io/library/fedora:34 as hcloud
-
-ARG HCLOUD_RELEASE=v1.26.1
-ENV HCLOUD_RELEASE=${HCLOUD_RELEASE}
-
-RUN curl -L "https://github.com/hetznercloud/cli/releases/download/${HCLOUD_RELEASE}/hcloud-linux-amd64.tar.gz" | tar xvzf - hcloud \
-    && install -o root -g root -m 0755 hcloud /usr/local/bin/hcloud
-
 # Helm CLI cache
-FROM docker.io/library/fedora:34 as helm
+FROM docker.io/library/fedora:35 as helm
 
 ARG HELM_RELEASE=v3.6.3
 ENV HELM_RELEASE=${HELM_RELEASE}
@@ -36,16 +23,16 @@ RUN curl -L "https://get.helm.sh/helm-${HELM_RELEASE}-linux-amd64.tar.gz" | tar
     && install -o root -g root -m 0755 helm /usr/local/bin/helm
 
 # Flux CLI cache
-FROM docker.io/library/fedora:34 as flux
+FROM docker.io/library/fedora:35 as flux
 
-ARG FLUX_RELEASE=0.16.2
+ARG FLUX_RELEASE=0.24.1
 ENV FLUX_RELEASE=${FLUX_RELEASE}
 
 RUN curl -L https://github.com/fluxcd/flux2/releases/download/v${FLUX_RELEASE}/flux_${FLUX_RELEASE}_linux_amd64.tar.gz | tar xvzf - flux \
     && install -o root -g root -m 0755 flux /usr/local/bin/flux
 
 # SOPS CLI cache
-FROM docker.io/library/fedora:34 as sops
+FROM docker.io/library/fedora:35 as sops
 
 ARG SOPS_RELEASE=v3.7.1
 ENV SOPS_RELEASE=${SOPS_RELEASE}
@@ -54,7 +41,7 @@ RUN curl -L https://github.com/mozilla/sops/releases/download/${SOPS_RELEASE}/so
     && install -o root -g root -m 0755 sops /usr/local/bin/sops
 
 # Actual start of container build
-FROM docker.io/library/fedora:34
+FROM docker.io/library/fedora:35
 
 ARG MAINTAINER="unmaintained"
 LABEL maintainer=$MAINTAINER
@@ -88,11 +75,8 @@ RUN dnf install -y \
 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
 COPY --from=kubectl /usr/local/bin/kubectl /usr/local/bin/kubectl
 COPY --from=kubectl /usr/local/bin/kubectl-convert /usr/local/bin/kubectl-convert
-COPY --from=hcloud /usr/local/bin/hcloud /usr/local/bin/hcloud
 COPY --from=helm /usr/local/bin/helm /usr/local/bin/helm
 COPY --from=flux /usr/local/bin/flux /usr/local/bin/flux
 COPY --from=sops /usr/local/bin/sops /usr/local/bin/sops
@@ -101,7 +85,6 @@ RUN true \
     && echo "command -v flux >/dev/null && . <(flux completion bash)" >> /root/.bashrc \
     && 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 hcloud >/dev/null && . <(hcloud completion bash)" >> /root/.bashrc \
     && true
 
 # Create workspace