diff --git a/Dockerfile b/Dockerfile
index f8e85a7..0d082d3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,4 @@
-FROM debian:stretch
-
-MAINTAINER pavelsh@microsoft.com
+FROM debian:buster
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/Dockerfile.bm.prod b/Dockerfile.bm.prod
index 723cc94..490ff01 100644
--- a/Dockerfile.bm.prod
+++ b/Dockerfile.bm.prod
@@ -1,7 +1,5 @@
 FROM rest-api-common
 
-MAINTAINER pavelsh@microsoft.com
-
 RUN apt-get autoremove -y \
  && apt-get clean \
  && rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/Dockerfile.build b/Dockerfile.build
index 3af6aef..24e6a35 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,6 +1,4 @@
-FROM debian:stretch
-
-MAINTAINER pavelsh@microsoft.com
+FROM debian:buster
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/Dockerfile.common.prod b/Dockerfile.common.prod
index 668a09d..fb13118 100644
--- a/Dockerfile.common.prod
+++ b/Dockerfile.common.prod
@@ -1,6 +1,4 @@
-FROM debian:jessie
-
-MAINTAINER pavelsh@microsoft.com
+FROM debian:buster
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
diff --git a/Dockerfile.msee.prod b/Dockerfile.msee.prod
index 1806394..2961d00 100644
--- a/Dockerfile.msee.prod
+++ b/Dockerfile.msee.prod
@@ -1,7 +1,5 @@
 FROM rest-api-common
 
-MAINTAINER pavelsh@microsoft.com
-
 RUN apt-get -y install libqt5network5
 
 COPY supervisor/arp_responder_msee.conf /etc/supervisor/conf.d/
diff --git a/Dockerfile.test b/Dockerfile.test
index 0279e81..0ecaaeb 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,6 +1,4 @@
-FROM debian:stretch
-
-MAINTAINER pavelsh@microsoft.com
+FROM debian:buster
 
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive