diff --git a/consul/Dockerfile b/consul/Dockerfile
index 4384b42..f1f3599 100644
--- a/consul/Dockerfile
+++ b/consul/Dockerfile
@@ -5,7 +5,9 @@ ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
 RUN apt-get update && apt-get install -y \
+	apt-transport-https \
 	ca-certificates \
+	curl \
 	gcc \
 	git \
 	make \
@@ -14,7 +16,20 @@ RUN apt-get update && apt-get install -y \
 	--no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
-ENV CONSUL_VERSION v1.4.3
+# Add yarn to apt repos.
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+
+# Setup node install.
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+
+RUN apt-get update && apt-get install -y \
+	nodejs \
+	yarn \
+	--no-install-recommends \
+	&& rm -rf /var/lib/apt/lists/*
+
+ENV CONSUL_VERSION v1.5.1
 
 RUN go get github.com/hashicorp/consul
 
@@ -27,8 +42,9 @@ RUN gem install \
 	bundler \
 	--no-ri --no-rdoc
 
-RUN cd ui \
-	&& make dist
+RUN cd ui-v2 \
+	&& yarn install \
+	&& make
 
 RUN TERM=xterm XC_ARCH="amd64" XC_OS="linux" LD_FLAGS=" -extldflags -static" make tools static-assets bin \
 	&& mv bin/consul /usr/bin/consul
diff --git a/terraform/Dockerfile b/terraform/Dockerfile
index 20d1d12..611c696 100644
--- a/terraform/Dockerfile
+++ b/terraform/Dockerfile
@@ -7,8 +7,10 @@ ENV GOPATH /go
 RUN	apk add --no-cache \
 	bash \
 	ca-certificates \
+	gcc \
 	git \
 	make \
+	musl-dev \
 	zip
 
 ENV TERRAFORM_VERSION v0.12.0