diff --git a/dockerbuild/Dockerfile.debian-bullseye b/dockerbuild/Dockerfile.debian-bullseye
index 47f654b91..d572bb99d 100644
--- a/dockerbuild/Dockerfile.debian-bullseye
+++ b/dockerbuild/Dockerfile.debian-bullseye
@@ -5,7 +5,7 @@ ARG BUILDPLATFORM
 ARG TARGETPLATFORM
 
 RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd libssl-dev
-RUN if test "$TARGETPLATFORM" = "linux/mips64le" ]; then \
+RUN if test "$TARGETPLATFORM" = "linux/mips64le"; then \
     apt-get install golang; \
     else \
     curl -s -k $go_pkg_url -o go.tar.gz; \
diff --git a/dockerbuild/Dockerfile.debian-buster b/dockerbuild/Dockerfile.debian-buster
index ab5ebb4d1..46cfc3873 100644
--- a/dockerbuild/Dockerfile.debian-buster
+++ b/dockerbuild/Dockerfile.debian-buster
@@ -1,12 +1,17 @@
-FROM debian:buster-20191224
+FROM debian:buster-20200607
 
 ARG go_pkg_url
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM
 
 RUN apt-get update && apt-get -y install build-essential curl cmake ca-certificates devscripts dh-systemd
-
-RUN curl -s -k $go_pkg_url -o go.tar.gz && \
-    tar -C /usr/local -xzf go.tar.gz && \
-    rm go.tar.gz
+RUN if test "$TARGETPLATFORM" = "linux/mips64le"; then \
+    apt-get install golang; \
+    else \
+    curl -s -k $go_pkg_url -o go.tar.gz; \
+    tar -C /usr/local -xzf go.tar.gz; \
+    rm go.tar.gz; \
+    fi;
 
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
 RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
diff --git a/dockerbuild/Dockerfile.debian-sid b/dockerbuild/Dockerfile.debian-sid
index 90e96ec54..0be559466 100644
--- a/dockerbuild/Dockerfile.debian-sid
+++ b/dockerbuild/Dockerfile.debian-sid
@@ -1,17 +1,20 @@
-FROM debian:sid-20191224
+FROM debian:sid-20200607
 
 ARG go_pkg_url
 
 RUN apt-get update && apt-get upgrade -y && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd
+RUN if test "$TARGETPLATFORM" = "linux/mips64le"; then \
+    apt-get install golang; \
+    else \
+    curl -s -k $go_pkg_url -o go.tar.gz; \
+    tar -C /usr/local -xzf go.tar.gz; \
+    rm go.tar.gz; \
+    fi;
 RUN curl -s -k -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz -o cmake-3.17.3.tar.gz && tar -xzf cmake-3.17.3.tar.gz
 WORKDIR /cmake-3.17.3
 RUN ./bootstrap && make -j8 && make install
 WORKDIR /
 
-RUN curl -s -k $go_pkg_url -o go.tar.gz && \
-    tar -C /usr/local -xzf go.tar.gz && \
-    rm go.tar.gz
-
 RUN groupadd -g 1000 jenkins-build && useradd -u 1000 -g 1000 jenkins-build
 RUN chmod 777 /home && mkdir -p /home/jenkins-build && chown jenkins-build:jenkins-build /home/jenkins-build && chmod 777 /home/jenkins-build
 CMD ["/usr/bin/sshd", "-D"]
diff --git a/dockerbuild/Dockerfile.debian-stretch b/dockerbuild/Dockerfile.debian-stretch
index f08f6e3af..28753aff4 100644
--- a/dockerbuild/Dockerfile.debian-stretch
+++ b/dockerbuild/Dockerfile.debian-stretch
@@ -1,12 +1,16 @@
-FROM debian:stretch-20191224
+FROM debian:stretch-20200607
 
 ARG go_pkg_url
 
 RUN apt-get update && apt-get -y install build-essential curl ca-certificates devscripts dh-systemd libssl-dev
 
-RUN curl -s -k -L $go_pkg_url -o go.tar.gz && \
-    tar -C /usr/local -xzf go.tar.gz && \
-    rm go.tar.gz
+RUN if test "$TARGETPLATFORM" = "linux/mips64le"; then \
+    apt-get install golang; \
+    else \
+    curl -s -k $go_pkg_url -o go.tar.gz; \
+    tar -C /usr/local -xzf go.tar.gz; \
+    rm go.tar.gz; \
+    fi;
 RUN curl -s -k -L https://github.com/Kitware/CMake/releases/download/v3.17.3/cmake-3.17.3.tar.gz -o cmake-3.17.3.tar.gz && tar -xzf cmake-3.17.3.tar.gz
 WORKDIR /cmake-3.17.3
 RUN ./bootstrap && make -j8 && make install