diff --git a/packer/Dockerfile-light b/packer/Dockerfile-light
index 70302d8..28123ba 100644
--- a/packer/Dockerfile-light
+++ b/packer/Dockerfile-light
@@ -11,7 +11,7 @@ ADD https://releases.hashicorp.com/packer/${PACKER_VERSION}/packer_${PACKER_VERS
 
 RUN sed -i '/packer_${PACKER_VERSION}_linux_amd64.zip/!d' packer_${PACKER_VERSION}_SHA256SUMS
 RUN sha256sum -cs packer_${PACKER_VERSION}_SHA256SUMS
-RUN unzip packer_${PACKER_VERSION}_linux_amd64.zip
+RUN unzip packer_${PACKER_VERSION}_linux_amd64.zip -d /bin
 RUN rm -f packer_${PACKER_VERSION}_linux_amd64.zip
 
-ENTRYPOINT ["/packer"]
+ENTRYPOINT ["/bin/packer"]
diff --git a/terraform/Dockerfile-light b/terraform/Dockerfile-light
index 978b3b0..df19f7a 100644
--- a/terraform/Dockerfile-light
+++ b/terraform/Dockerfile-light
@@ -11,7 +11,7 @@ ADD https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TE
 
 RUN sed -i '/terraform_${TERRAFORM_VERSION}_linux_amd64.zip/!d' terraform_${TERRAFORM_VERSION}_SHA256SUMS
 RUN sha256sum -cs terraform_${TERRAFORM_VERSION}_SHA256SUMS
-RUN unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip
+RUN unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /bin
 RUN rm -f terraform_${TERRAFORM_VERSION}_linux_amd64.zip
 
-ENTRYPOINT ["/terraform"]
+ENTRYPOINT ["/bin/terraform"]