diff --git a/lazy.ansible/.manala/docker/Dockerfile.tmpl b/lazy.ansible/.manala/docker/Dockerfile.tmpl
index f8bc35b0..bfef6e40 100644
--- a/lazy.ansible/.manala/docker/Dockerfile.tmpl
+++ b/lazy.ansible/.manala/docker/Dockerfile.tmpl
@@ -181,12 +181,10 @@ RUN \
     curl -sSL "https://releases.hashicorp.com/terraform/{{ $terraform.version }}/terraform_{{ $terraform.version }}_linux_{{ include "arch_map" (dict "amd64" "amd64" "arm64" "arm64") }}.zip" \
         | bsdtar -xvf - -C /usr/local/bin \
     && chmod +x /usr/local/bin/terraform \
-    # Bash completion
-    && echo "complete -C /usr/local/bin/terraform terraform" > /etc/bash_completion.d/terraform \
     # Bash aliases
-    && printf "alias tf='terraform'\n\
-complete -C /usr/local/bin/terraform tf\n\
-" > /etc/profile.d/terraform.sh
+    && echo "alias tf='terraform'" > /etc/profile.d/terraform.sh \
+    # Bash completion
+    && echo "complete -C /usr/local/bin/terraform terraform tf" > /etc/bash_completion.d/terraform
 
 {{ end -}}
 
diff --git a/lazy.kubernetes/.manala/docker/Dockerfile.tmpl b/lazy.kubernetes/.manala/docker/Dockerfile.tmpl
index 52e71e3d..6e9ed35e 100644
--- a/lazy.kubernetes/.manala/docker/Dockerfile.tmpl
+++ b/lazy.kubernetes/.manala/docker/Dockerfile.tmpl
@@ -174,9 +174,8 @@ RUN \
     # Bash aliases
     && printf "\
 alias hf='helmfile'\n\
-complete -F __start_helmfile hf\n\
 alias hfi='helmfile --interactive'\n\
-complete -F __start_helmfile hfi\n\
+complete -F __start_helmfile hf hfi\n\
 " > /etc/profile.d/helmfile.sh
 
 {{ end -}}