diff --git a/Dockerfile b/Dockerfile
index ba599e0b4..2d9abf391 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ WORKDIR /packages
 #
 # Repo: <https://github.com/cloudposse/packages>
 #
-ARG PACKAGES="awless cfssl cfssljson fetch figurine github-commenter goofys helm helmfile kops kubectl kubectx kubens sops stern terraform terragrunt shellcheck shfmt yq"
+ARG PACKAGES="cfssl cfssljson"
 ENV PACKAGES=${PACKAGES}
 RUN make dist
 
@@ -129,7 +129,7 @@ ENV KOPS_PRIVATE_SUBNETS="172.20.32.0/19,172.20.64.0/19,172.20.96.0/19,172.20.12
 ENV KOPS_UTILITY_SUBNETS="172.20.0.0/22,172.20.4.0/22,172.20.8.0/22,172.20.12.0/22"
 ENV KOPS_AVAILABILITY_ZONES="us-west-2a,us-west-2b,us-west-2c"
 ENV KUBECONFIG=/dev/shm/kubecfg
-RUN /usr/local/bin/kops completion bash > /etc/bash_completion.d/kops.sh
+RUN /usr/bin/kops completion bash > /etc/bash_completion.d/kops.sh
 
 # Instance sizes
 ENV BASTION_MACHINE_TYPE "t2.medium"
diff --git a/packages.txt b/packages.txt
index a24f0a001..7f64afcb6 100644
--- a/packages.txt
+++ b/packages.txt
@@ -1,4 +1,5 @@
 # Essential alpine packages
+awless@cloudposse
 aws-iam-authenticator@cloudposse
 aws-vault@cloudposse
 bash
@@ -8,14 +9,24 @@ chamber@cloudposse
 curl
 drill
 dumb-init
+fetch@cloudposse
 figlet
+figurine@cloudposse
 fuse
 gettext
 git
+github-commenter@cloudposse
 gomplate@cloudposse
+goofys@cloudposse
 groff
+helm@cloudposse
+helmfile@cloudposse
 iputils
 jq
+kops@cloudposse
+kubectl@cloudposse
+kubectx@cloudposse
+kubens@cloudposse
 less
 libc6-compat
 libltdl
@@ -27,9 +38,16 @@ openssh-client
 openssl
 pwgen
 python
+shellcheck@cloudposse
+shfmt@cloudposse
+sops@cloudposse
 sshpass
+stern@cloudposse
 syslog-ng
 tar
+terraform@cloudposse
+terragrunt@cloudposse
 unzip
 util-linux
 vim
+yq@cloudposse