diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 0467b98..b8aae13 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -71,10 +71,10 @@ RUN sudo bash -c "echo 'http://dl-cdn.alpinelinux.org/alpine/edge/main' >> /etc/
     curl -SLO "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz" > "google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz" && \
     echo "${GCLOUD_SHA256SUM} google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz" > "google-cloud-cli-${GCLOUD_VERSION}-SHA256SUMS" && \
     sha256sum -cs "google-cloud-cli-${GCLOUD_VERSION}-SHA256SUMS" && sudo rm "google-cloud-cli-${GCLOUD_VERSION}-SHA256SUMS" && \
-    sudo tar -xvzf google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz -C /usr/local && \
-    rm google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz && \
+    sudo tar -xvzf "google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz" -C /usr/local && \
+    rm "google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz" && \
     sudo chmod +x /usr/local/google-cloud-sdk/install.sh && \
-    sudo chown -R $(whoami) /usr/local/google-cloud-sdk && \
+    sudo chown -R "$(whoami)" /usr/local/google-cloud-sdk && \
     sh /usr/local/google-cloud-sdk/install.sh -q && \
     curl -SLO "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" > "terraform_${TERRAFORM_VERSION}_linux_amd64.zip" && \
     echo "${TERRAFORM_SHA256SUM}  terraform_${TERRAFORM_VERSION}_linux_amd64.zip" > "terraform_${TERRAFORM_VERSION}_SHA256SUMS" && \
diff --git a/Dockerfile.slim b/Dockerfile.slim
index 46e8f2e..82a766c 100644
--- a/Dockerfile.slim
+++ b/Dockerfile.slim
@@ -72,10 +72,10 @@ RUN sudo apt-get update && sudo apt-get install --no-install-recommends -y \
     curl -SLO "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz" > "google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz" && \
     echo "${GCLOUD_SHA256SUM} google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz" > "google-cloud-cli-${GCLOUD_VERSION}-SHA256SUMS" && \
     sha256sum -c "google-cloud-cli-${GCLOUD_VERSION}-SHA256SUMS" && sudo rm "google-cloud-cli-${GCLOUD_VERSION}-SHA256SUMS" && \
-    sudo tar -xvzf google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz -C /usr/local && \
-    rm google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz && \
+    sudo tar -xvzf "google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz" -C /usr/local && \
+    rm "google-cloud-cli-${GCLOUD_VERSION}-linux-x86_64.tar.gz" && \
     sudo chmod +x /usr/local/google-cloud-sdk/install.sh && \
-    sudo chown -R $(whoami) /usr/local/google-cloud-sdk && \
+    sudo chown -R "$(whoami)" /usr/local/google-cloud-sdk && \
     sh /usr/local/google-cloud-sdk/install.sh -q && \
     curl -SLO "https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip" > "terraform_${TERRAFORM_VERSION}_linux_amd64.zip" && \
     echo "${TERRAFORM_SHA256SUM}  terraform_${TERRAFORM_VERSION}_linux_amd64.zip" > "terraform_${TERRAFORM_VERSION}_SHA256SUMS" && \