diff --git a/solr/Dockerfile b/solr/Dockerfile
index 65657bde..9eb658c3 100644
--- a/solr/Dockerfile
+++ b/solr/Dockerfile
@@ -8,14 +8,12 @@ USER root
 #######################
 
 # Add curl to access API routes
-RUN apt-get update && apt-get install -y curl vim stunnel4 git
+RUN apt-get update && apt dist-upgrade -y && apt-get install -y curl vim stunnel4 git
 
 # Install EFS Dependencies
-RUN git clone https://github.com/aws/efs-utils && \
-  cd efs-utils && \
-  apt-get -y install binutils rustc cargo pkg-config libssl-dev && \
-  ./build-deb.sh && \
-  apt-get -y install ./build/amazon-efs-utils*deb
+RUN apt-get -y install binutils rustc cargo pkg-config libssl-dev
+RUN git clone --depth 1 --branch v2.1.0 https://github.com/aws/efs-utils
+RUN cd efs-utils && ./build-deb.sh && apt-get -y install ./build/amazon-efs-utils*deb
 
 # Install hostname resolution dependencies
 RUN apt-get install -y dnsutils