diff --git a/workbench/Dockerfile b/workbench/Dockerfile
index 4275ec4935ef54fed717817be956a123dae10ddb..2ad7d99ea3576981c7f994d43ece167b8b278844 100644
--- a/workbench/Dockerfile
+++ b/workbench/Dockerfile
@@ -273,6 +273,7 @@ RUN export GOPATH=/usr/local/lib/go && \
     mkdir "$GOPATH" && \
     export GO111MODULE=on && \
     go install github.com/1player/host-spawn@latest && \
+    go install github.com/asdf-vm/asdf/cmd/asdf@v0.16.0 && \
     go install github.com/aquaproj/aqua/v2/cmd/aqua@latest && \
     go install github.com/giantswarm/semver-bump@latest && \
     go install github.com/hashicorp/envconsul@latest && \
@@ -296,9 +297,7 @@ RUN install -m 0755 <(curl https://raw.githubusercontent.com/rabbitmq/rabbitmq-s
     install <(curl 'https://repo1.maven.org/maven2/com/madgag/bfg/1.14.0/bfg-1.14.0.jar') /usr/local/share/bfg/bfg.jar && \
     curl https://github.com/SelfAdjointOperator/better-adb-sync/archive/refs/heads/master.tar.gz | tar -zxC /opt/ && \
     ln --symbolic /opt/better-adb-sync-master/src/adbsync.py /usr/local/bin/adbsync && \
-    curl https://github.com/asdf-vm/asdf/archive/refs/heads/master.tar.gz | tar -zxC /opt/ && \
-    ln --symbolic --target /etc/profile.d/ /opt/asdf-master/asdf.sh && \
-    echo "export PATH=$PIPX_BIN_DIR:/usr/local/lib/go/bin:\$PATH" > /etc/profile.d/workbench.sh && \
+    echo "export PATH=\$HOME/.asdf/shims:$PIPX_BIN_DIR:/usr/local/lib/go/bin:\$PATH" > /etc/profile.d/workbench.sh && \
     rm -rf /tmp/* /var/tmp/* ~/.cache/*
 RUN _PIPENV_COMPLETE=bash_source pipenv > /etc/bash_completion.d/pipenv && \
     rabbitmqadmin --bash-completion  > /etc/bash_completion.d/rabbitmqadmin && \
@@ -313,13 +312,13 @@ RUN _PIPENV_COMPLETE=bash_source pipenv > /etc/bash_completion.d/pipenv && \
     skaffold completion bash > /etc/bash_completion.d/skaffold && \
     kustomize completion bash > /etc/bash_completion.d/kustomize && \
     devpod completion bash > /etc/bash_completion.d/devpod && \
+    asdf completion bash > /etc/bash_completion.d/asdf && \
     wget https://raw.githubusercontent.com/docker/compose/1.29.2/contrib/completion/bash/docker-compose -qO /etc/bash_completion.d/docker-compose && \
     wget https://raw.githubusercontent.com/ansible-community/molecule/1.25.1/asset/bash_completion/molecule.bash-completion.sh -qO /etc/bash_completion.d/molecule && \
     wget https://github.com/mrolli/packer-bash-completion/raw/master/packer -qO /etc/bash_completion.d/packer && \
     wget https://raw.githubusercontent.com/dsifford/yarn-completion/v0.17.0/yarn-completion.bash -qO /etc/bash_completion.d/yarn && \
     wget https://github.com/containers/podman/raw/main/completions/bash/podman -qO /etc/bash_completion.d/podman && \
     #wget https://raw.githubusercontent.com/ziglang/shell-completions/master/_zig -qO /etc/bash_completion.d/zig && \
-    ln --symbolic /opt/asdf-master/completions/asdf.bash /etc/bash_completion.d/asdf && \
     rm -rf /tmp/* /var/tmp/* ~/.cache/*
 RUN mkdir -p /usr/local/share/ca-certificates && \
     wget https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem  -qO - | \
@@ -329,6 +328,5 @@ RUN mkdir -p /usr/local/share/ca-certificates && \
     rm -rf /tmp/* /var/tmp/* ~/.cache/*
 COPY --chown=root:root bash_completion.d/* /etc/bash_completion.d/
 COPY --chown=root:root bin/* /usr/local/bin/
-ENV ASDF_DIR /opt/asdf-master
 VOLUME /run/sshd
 CMD ["/bin/bash"]