diff --git a/cookbook/case_studies/feature_engineering/eda/Dockerfile b/cookbook/case_studies/feature_engineering/eda/Dockerfile
index 6f8eabfff1..a39bcc073b 100644
--- a/cookbook/case_studies/feature_engineering/eda/Dockerfile
+++ b/cookbook/case_studies/feature_engineering/eda/Dockerfile
@@ -22,8 +22,10 @@ RUN apt-get update && apt-get install -y libsm6 libxext6 libxrender-dev ffmpeg
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 # Virtual environment
 RUN python3.8 -m venv ${VENV}
diff --git a/cookbook/case_studies/feature_engineering/feast_integration/Dockerfile b/cookbook/case_studies/feature_engineering/feast_integration/Dockerfile
index b59849282a..3a3ebe59c2 100644
--- a/cookbook/case_studies/feature_engineering/feast_integration/Dockerfile
+++ b/cookbook/case_studies/feature_engineering/feast_integration/Dockerfile
@@ -10,8 +10,10 @@ ENV PYTHONPATH "$PYTHONPATH:/root/feast_integration"
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 # Virtual environment
 RUN python3 -m venv ${VENV}
diff --git a/cookbook/case_studies/ml_training/house_price_prediction/Dockerfile b/cookbook/case_studies/ml_training/house_price_prediction/Dockerfile
index 81594d78cb..cdd52ee32f 100644
--- a/cookbook/case_studies/ml_training/house_price_prediction/Dockerfile
+++ b/cookbook/case_studies/ml_training/house_price_prediction/Dockerfile
@@ -22,8 +22,10 @@ RUN apt-get update && apt-get install -y libsm6 libxext6 libxrender-dev ffmpeg
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 # Virtual environment
 RUN python3.8 -m venv ${VENV}
diff --git a/cookbook/case_studies/ml_training/mnist_classifier/Dockerfile b/cookbook/case_studies/ml_training/mnist_classifier/Dockerfile
index 94e35b157c..e578da61b5 100644
--- a/cookbook/case_studies/ml_training/mnist_classifier/Dockerfile
+++ b/cookbook/case_studies/ml_training/mnist_classifier/Dockerfile
@@ -15,7 +15,7 @@ RUN pip install awscli
 
 # Install gcloud for GCP
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 RUN apt-get update && apt-get install -y make build-essential libssl-dev curl
 
diff --git a/cookbook/case_studies/ml_training/pima_diabetes/Dockerfile b/cookbook/case_studies/ml_training/pima_diabetes/Dockerfile
index ecf256c102..605beb4840 100644
--- a/cookbook/case_studies/ml_training/pima_diabetes/Dockerfile
+++ b/cookbook/case_studies/ml_training/pima_diabetes/Dockerfile
@@ -22,8 +22,10 @@ RUN apt-get update && apt-get install -y libsm6 libxext6 libxrender-dev ffmpeg
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 # Virtual environment
 RUN python3.8 -m venv ${VENV}
diff --git a/cookbook/case_studies/ml_training/spark_horovod/Dockerfile b/cookbook/case_studies/ml_training/spark_horovod/Dockerfile
index e77adbd97e..802627d066 100644
--- a/cookbook/case_studies/ml_training/spark_horovod/Dockerfile
+++ b/cookbook/case_studies/ml_training/spark_horovod/Dockerfile
@@ -38,8 +38,10 @@ ENV PATH="${VENV}/bin:$PATH"
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 # Install wheel after venv is activated
 RUN pip3 install wheel
diff --git a/cookbook/core/Dockerfile b/cookbook/core/Dockerfile
index 78dae5ab70..8b92239364 100644
--- a/cookbook/core/Dockerfile
+++ b/cookbook/core/Dockerfile
@@ -14,8 +14,11 @@ RUN apt-get update && apt-get install -y libsm6 libxext6 libxrender-dev ffmpeg b
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
+
 
 ENV VENV /opt/venv
 # Virtual environment
diff --git a/cookbook/integrations/aws/athena/Dockerfile b/cookbook/integrations/aws/athena/Dockerfile
index f749075392..06fa4fe0b4 100644
--- a/cookbook/integrations/aws/athena/Dockerfile
+++ b/cookbook/integrations/aws/athena/Dockerfile
@@ -14,8 +14,10 @@ RUN apt-get update && apt-get install -y libsm6 libxext6 libxrender-dev ffmpeg b
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 ENV VENV /opt/venv
 # Virtual environment
diff --git a/cookbook/integrations/aws/sagemaker_pytorch/Dockerfile b/cookbook/integrations/aws/sagemaker_pytorch/Dockerfile
index 159817ec70..2f240d34f5 100644
--- a/cookbook/integrations/aws/sagemaker_pytorch/Dockerfile
+++ b/cookbook/integrations/aws/sagemaker_pytorch/Dockerfile
@@ -17,8 +17,10 @@ RUN apt-get update && apt-get install -y make build-essential libssl-dev curl
 RUN pip install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 # Install gcc , g++ and make
 RUN echo 'deb http://deb.debian.org/debian testing main' >> /etc/apt/sources.list \
diff --git a/cookbook/integrations/aws/sagemaker_training/Dockerfile b/cookbook/integrations/aws/sagemaker_training/Dockerfile
index c291701bb3..059e12e261 100644
--- a/cookbook/integrations/aws/sagemaker_training/Dockerfile
+++ b/cookbook/integrations/aws/sagemaker_training/Dockerfile
@@ -10,8 +10,10 @@ ENV PYTHONPATH /root
 RUN pip install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 # Setup a virtual environment
 ENV VENV /opt/venv
diff --git a/cookbook/integrations/flytekit_plugins/dolt/Dockerfile b/cookbook/integrations/flytekit_plugins/dolt/Dockerfile
index 1ff74e45e6..9aa4ec225d 100644
--- a/cookbook/integrations/flytekit_plugins/dolt/Dockerfile
+++ b/cookbook/integrations/flytekit_plugins/dolt/Dockerfile
@@ -18,8 +18,10 @@ RUN sudo bash -c 'curl -L https://github.com/dolthub/dolt/releases/latest/downlo
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 ENV VENV /opt/venv
 # Virtual environment
diff --git a/cookbook/integrations/flytekit_plugins/greatexpectations/Dockerfile b/cookbook/integrations/flytekit_plugins/greatexpectations/Dockerfile
index 8e898d8d76..e3569b4968 100644
--- a/cookbook/integrations/flytekit_plugins/greatexpectations/Dockerfile
+++ b/cookbook/integrations/flytekit_plugins/greatexpectations/Dockerfile
@@ -10,8 +10,10 @@ ENV PYTHONPATH /root
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 ENV VENV /opt/venv
 # Virtual environment
diff --git a/cookbook/integrations/flytekit_plugins/pandera_examples/Dockerfile b/cookbook/integrations/flytekit_plugins/pandera_examples/Dockerfile
index 60be741701..f844f39de1 100644
--- a/cookbook/integrations/flytekit_plugins/pandera_examples/Dockerfile
+++ b/cookbook/integrations/flytekit_plugins/pandera_examples/Dockerfile
@@ -10,8 +10,10 @@ ENV PYTHONPATH /root
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 ENV VENV /opt/venv
 # Virtual environment
diff --git a/cookbook/integrations/flytekit_plugins/papermilltasks/Dockerfile b/cookbook/integrations/flytekit_plugins/papermilltasks/Dockerfile
index bebedaf64a..81f567fa59 100644
--- a/cookbook/integrations/flytekit_plugins/papermilltasks/Dockerfile
+++ b/cookbook/integrations/flytekit_plugins/papermilltasks/Dockerfile
@@ -10,8 +10,10 @@ ENV PYTHONPATH /root
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 ENV VENV /opt/venv
 # Virtual environment
diff --git a/cookbook/integrations/flytekit_plugins/sql/Dockerfile b/cookbook/integrations/flytekit_plugins/sql/Dockerfile
index bb736eaee1..8815e38be4 100644
--- a/cookbook/integrations/flytekit_plugins/sql/Dockerfile
+++ b/cookbook/integrations/flytekit_plugins/sql/Dockerfile
@@ -10,8 +10,10 @@ ENV PYTHONPATH /root
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 ENV VENV /opt/venv
 # Virtual environment
diff --git a/cookbook/integrations/kubernetes/k8s_spark/Dockerfile b/cookbook/integrations/kubernetes/k8s_spark/Dockerfile
index 4e6575274f..e165a8b948 100644
--- a/cookbook/integrations/kubernetes/k8s_spark/Dockerfile
+++ b/cookbook/integrations/kubernetes/k8s_spark/Dockerfile
@@ -16,8 +16,10 @@ RUN apt-get update && apt-get install -y python3.8 python3.8-venv make build-ess
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 ENV VENV /opt/venv
 # Virtual environment
diff --git a/cookbook/integrations/kubernetes/kfmpi/Dockerfile b/cookbook/integrations/kubernetes/kfmpi/Dockerfile
index 2df52d5259..2cf3bf1522 100644
--- a/cookbook/integrations/kubernetes/kfmpi/Dockerfile
+++ b/cookbook/integrations/kubernetes/kfmpi/Dockerfile
@@ -38,8 +38,10 @@ ENV PATH="${VENV}/bin:$PATH"
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 # Install wheel after venv is activated
 RUN pip3 install wheel
diff --git a/cookbook/integrations/kubernetes/kfpytorch/Dockerfile b/cookbook/integrations/kubernetes/kfpytorch/Dockerfile
index 8dcf2aca63..f911e85835 100644
--- a/cookbook/integrations/kubernetes/kfpytorch/Dockerfile
+++ b/cookbook/integrations/kubernetes/kfpytorch/Dockerfile
@@ -15,8 +15,10 @@ RUN apt-get update && apt-get install -y make build-essential libssl-dev curl
 RUN pip install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 # Install gcc , g++ and make
 RUN echo 'deb http://deb.debian.org/debian testing main' >> /etc/apt/sources.list \
diff --git a/cookbook/integrations/kubernetes/pod/Dockerfile b/cookbook/integrations/kubernetes/pod/Dockerfile
index a4b4e6014e..0fa2c4797f 100644
--- a/cookbook/integrations/kubernetes/pod/Dockerfile
+++ b/cookbook/integrations/kubernetes/pod/Dockerfile
@@ -11,8 +11,10 @@ ENV PYTHONPATH /root
 RUN pip3 install awscli
 
 # Install gcloud for GCP
+RUN apt-get install curl --assume-yes
+
 RUN curl -sSL https://sdk.cloud.google.com | bash
-ENV PATH="$PATH:/root/google-cloud-sdk/bin"
+ENV PATH $PATH:/root/google-cloud-sdk/bin
 
 ENV VENV /opt/venv
 # Virtual environment