diff --git a/hadoop-ozone/dev-support/docker/Dockerfile b/hadoop-ozone/dev-support/docker/Dockerfile
index aa8e9665b3b2..6e898a97ed3f 100644
--- a/hadoop-ozone/dev-support/docker/Dockerfile
+++ b/hadoop-ozone/dev-support/docker/Dockerfile
@@ -13,34 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 FROM alpine
-RUN apk add --update --no-cache bash alpine-sdk maven grep openjdk8 py-pip rsync procps autoconf automake libtool findutils
+RUN apk add --update --no-cache bash alpine-sdk maven grep openjdk8 py-pip rsync procps autoconf automake libtool findutils python3-dev libffi-dev openssl-dev gcc libc-dev rust cargo make
 
 #Install real glibc
 RUN apk --no-cache add ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
-    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
-    apk add glibc-2.28-r0.apk
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.33-r0/glibc-2.33-r0.apk && \
+    apk add glibc-2.33-r0.apk
 
-#Install protobuf
-RUN mkdir -p /usr/local/src/ && \
-    cd /usr/local/src/ && \
-    wget https://github.com/google/protobuf/releases/download/v2.5.0/protobuf-2.5.0.tar.gz && \
-    tar xvf protobuf-2.5.0.tar.gz && \
-    cd protobuf-2.5.0 && \
-    ./autogen.sh && \
-    ./configure --prefix=/usr && \
-    make && \
-    make install && \
-    protoc --version
-
-#Findbug install
+#Spotbugs install
 RUN mkdir -p /opt && \
-    curl -sL https://sourceforge.net/projects/findbugs/files/findbugs/3.0.1/findbugs-3.0.1.tar.gz/download | tar -xz  && \
-     mv findbugs-* /opt/findbugs
+    curl -sL https://repo.maven.apache.org/maven2/com/github/spotbugs/spotbugs/3.1.12/spotbugs-3.1.12.tgz | tar -xz  && \
+    mv spotbugs-* /opt/spotbugs 
 
 #Install apache-ant
 RUN mkdir -p /opt && \
-    curl -sL 'https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=/ant/binaries/apache-ant-1.10.5-bin.tar.gz' | tar -xz  && \
+    curl -sL 'https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=/ant/binaries/apache-ant-1.10.11-bin.tar.gz' | tar -xz  && \
        mv apache-ant* /opt/ant
 
 #Install docker-compose
@@ -49,7 +37,7 @@ RUN pip install docker-compose
 #Install pytest==2.8.7
 RUN pip install pytest==2.8.7
 
-ENV PATH=$PATH:/opt/findbugs/bin
+ENV PATH=$PATH:/opt/spotbugs/bin
 
 RUN addgroup -g 1000 default && \
    for i in $(seq 1 2000); do adduser jenkins$i -u $i -G default -h /tmp/ -H -D; done
@@ -61,9 +49,9 @@ RUN addgroup -g 1000 default && \
 #can be installed
 USER jenkins1000
 RUN cd /tmp && \
-   git clone --depth=1 https://gitbox.apache.org/repos/asf/hadoop.git -b trunk && \
-   cd /tmp/hadoop && \
-   mvn package dependency:go-offline -DskipTests -P hdds -pl :ozone-dist -am && \
-   rm -rf /tmp/.m2/repository/org/apache/hadoop/*hdds* && \
-   rm -rf /tmp/.m2/repository/org/apache/hadoop/*ozone* && \
+   git clone --depth=1 https://gitbox.apache.org/repos/asf/ozone.git -b master && \
+   cd /tmp/ozone && \
+   mvn package dependency:go-offline -DskipTests -pl :ozone-dist -am && \
+   rm -rf /tmp/.m2/repository/org/apache/ozone/hdds* && \
+   rm -rf /tmp/.m2/repository/org/apache/ozone/ozone* && \
    find /tmp/.m2/repository -exec chmod o+wx {} \;
diff --git a/pom.xml b/pom.xml
index c7d270e594b7..bb3d9285b079 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,7 +222,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <surefire.fork.timeout>1200</surefire.fork.timeout>
     <aws-java-sdk.version>1.11.901</aws-java-sdk.version>
     <hsqldb.version>2.3.4</hsqldb.version>
-    <frontend-maven-plugin.version>1.10.0</frontend-maven-plugin.version>
+    <frontend-maven-plugin.version>1.12.0</frontend-maven-plugin.version>
     <!-- the version of Hadoop declared in the version resources; can be overridden
     so that Hadoop 3.x can declare itself a 2.x artifact. -->
     <declared.hadoop.version>${hadoop.version}</declared.hadoop.version>