diff --git a/src/circleci-base/Dockerfile b/src/circleci-base/Dockerfile
index 9be7597..719a931 100644
--- a/src/circleci-base/Dockerfile
+++ b/src/circleci-base/Dockerfile
@@ -1,7 +1,7 @@
 # Planet 4 CircleCI build image
 # Branch: develop
-# Commit: ad1e02597c28c81bedd826a5989b440823572031
-# Build:  https://circleci.com/gh/greenpeace/planet4-circleci/890
+# Commit: f1f9cbf5f73c66abf7cd162be2c0a7d7d3019afd
+# Build:  (local)
 # ------------------------------------------------------------------------
 #                     DO NOT MAKE CHANGES HERE
 # This file is built automatically from ./templates/Dockerfile.in
@@ -9,7 +9,7 @@
 
 FROM circleci/php:7.0-node
 
-LABEL maintainer="${MAINTAINER}" \
+LABEL maintainer="Raymond Walker <raymond.walker@greenpeace.org>" \
       description="Planet 4 CircleCI build image: \
 Base image for performing CI/CD operations in CircleCI"
 
@@ -20,35 +20,40 @@ ENV CIRCLECI_USER="circleci" \
 
 WORKDIR /home/circleci
 
+COPY .curlrc /home/circleci
+
 COPY ./scripts /home/circleci/scripts
-COPY ./etc/ /etc
 
 RUN git clone https://github.com/sstephenson/bats.git && \
     ./bats/install.sh /usr/local && \
     rm -fr /home/circleci/bats && \
-    curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 60 "https://releases.hashicorp.com/terraform/0.11.7/terraform_0.11.7_linux_amd64.zip" > /tmp/terraform.zip && \
+    curl -sS "https://releases.hashicorp.com/terraform/0.11.10/terraform_0.11.10_linux_amd64.zip" > /tmp/terraform.zip && \
     unzip /tmp/terraform.zip -d /usr/local/bin && \
     chmod 0755 /usr/local/bin/terraform && \
-    curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 60 -sSOL https://github.com/gruntwork-io/terragrunt/releases/download/v0.16.3/terragrunt_linux_amd64 && \
+    curl -sSO https://github.com/gruntwork-io/terragrunt/releases/download/v0.17.2/terragrunt_linux_amd64 && \
     chmod 0755 terragrunt_linux_amd64 && \
     mv terragrunt_linux_amd64 /usr/local/bin/terragrunt && \
-    curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 60 "https://beyondgrep.com/ack-2.24-single-file" > /usr/local/bin/ack && \
-    chmod 0755 /usr/local/bin/ack && \
     chmod 0755 /home/circleci/scripts/* && \
-    export "DESIRED_VERSION=v2.9.1" && \
-    curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 60 -sL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - && \
+    export "DESIRED_VERSION=v2.12.3" && \
+    curl -sS https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - && \
     wget --no-check-certificate -q https://raw.githubusercontent.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh && \
-    bash gitflow-installer.sh install stable && \
-    rm gitflow-installer.sh && \
-    curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 60 -sL https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 > /usr/local/bin/cloud_sql_proxy && \
+    bash gitflow-installer.sh install version 1.11.0 && \
+    rm -fr git-flow gitflow-installer.sh && \
+    curl -s https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 > /usr/local/bin/cloud_sql_proxy && \
     chmod 0755 /usr/local/bin/cloud_sql_proxy && \
     apt-get install -y --no-install-recommends \
+      gawk \
       gettext \
       mysql-client \
+      python-pip \
+      python-pkg-resources \
+      python-setuptools \
       shellcheck \
+      silversearcher-ag \
       vim \
       wget \
       && \
+    pip install yamllint && \
     npm install -g \
       junit-merge \
       tap-xunit && \
@@ -58,7 +63,7 @@ RUN git clone https://github.com/sstephenson/bats.git && \
 
 USER circleci
 
-RUN curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 0 --retry-max-time 60 -L "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/""google-cloud-sdk-209.0.0-linux-x86_64.tar.gz" | tar xz && \
+RUN curl "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-231.0.0-linux-x86_64.tar.gz" | tar xz && \
     CLOUDSDK_CORE_DISABLE_PROMPTS=1 ./google-cloud-sdk/install.sh \
         --usage-reporting false \
         --bash-completion false \
diff --git a/src/circleci-base/templates/Dockerfile.in b/src/circleci-base/templates/Dockerfile.in
index 2ea9790..0aa382b 100644
--- a/src/circleci-base/templates/Dockerfile.in
+++ b/src/circleci-base/templates/Dockerfile.in
@@ -28,8 +28,8 @@ RUN git clone https://github.com/sstephenson/bats.git && \
     export "DESIRED_VERSION=v${HELM_VERSION}" && \
     curl -sS https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash - && \
     wget --no-check-certificate -q https://raw.githubusercontent.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh && \
-    bash gitflow-installer.sh install stable && \
-    rm gitflow-installer.sh && \
+    bash gitflow-installer.sh install version 1.11.0 && \
+    rm -fr git-flow gitflow-installer.sh && \
     curl -s https://dl.google.com/cloudsql/cloud_sql_proxy.linux.amd64 > /usr/local/bin/cloud_sql_proxy && \
     chmod 0755 /usr/local/bin/cloud_sql_proxy && \
     apt-get install -y --no-install-recommends \