diff --git a/dev-support/Dockerfile b/dev-support/Dockerfile
index 89b7726bb69..5d79988664e 100644
--- a/dev-support/Dockerfile
+++ b/dev-support/Dockerfile
@@ -22,12 +22,8 @@
 # dev-support/flaky-tests/flaky-reporting.Jenkinsfile
 FROM ubuntu:18.04
 
-COPY . /hbase/dev-support
+ADD . /hbase/dev-support
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
-    && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install --no-install-recommends \
-      curl=7.58.0-2ubuntu3.8 \
-      python-pip=9.0.1-2.3~ubuntu1.18.04.1 \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* \
+RUN apt-get -y update \
+    && apt-get -y install curl python-pip \
     && pip install -r /hbase/dev-support/python-requirements.txt
diff --git a/dev-support/hbase_docker/Dockerfile b/dev-support/hbase_docker/Dockerfile
index c018a30c740..1a5dfa36976 100644
--- a/dev-support/hbase_docker/Dockerfile
+++ b/dev-support/hbase_docker/Dockerfile
@@ -17,25 +17,21 @@
 FROM ubuntu:14.04
 
 # Install Git, which is missing from the Ubuntu base images.
-RUN DEBIAN_FRONTEND=noninteractive apt-get -qq -y update \
-  && DEBIAN_FRONTEND=noninteractive apt-get -qq -y install --no-install-recommends \
-    git=1:1.9.1-1ubuntu0.10 \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y git
 
 # Add the dependencies from the hbase_docker folder and delete ones we don't need.
 WORKDIR /root
-COPY . /root
+ADD . /root
 RUN find . -not -name "*tar.gz" -delete
 
 # Install Java.
 RUN mkdir -p /usr/java
-RUN tar xzf ./*jdk* --strip-components 1 -C /usr/java
+RUN tar xzf *jdk* --strip-components 1 -C /usr/java
 ENV JAVA_HOME /usr/java
 
 # Install Maven.
 RUN mkdir -p /usr/local/apache-maven
-RUN tar xzf ./*maven* --strip-components 1 -C /usr/local/apache-maven
+RUN tar xzf *maven* --strip-components 1 -C /usr/local/apache-maven
 ENV MAVEN_HOME /usr/local/apache-maven
 
 # Add Java and Maven to the path.