diff --git a/edge-modules/SimulatedTemperatureSensor/docker/linux/arm32v7/base/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/linux/arm32v7/base/Dockerfile
deleted file mode 100644
index 3f871ea0f72..00000000000
--- a/edge-modules/SimulatedTemperatureSensor/docker/linux/arm32v7/base/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-ARG base_tag=3.1.19-bionic-arm32v7
-FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
-
-# Add an unprivileged user account for running the module
-RUN useradd -ms /bin/bash moduleuser
-USER moduleuser
diff --git a/edge-modules/SimulatedTemperatureSensor/docker/linux/arm64v8/base/Dockerfile b/edge-modules/SimulatedTemperatureSensor/docker/linux/arm64v8/base/Dockerfile
deleted file mode 100644
index 062289ae472..00000000000
--- a/edge-modules/SimulatedTemperatureSensor/docker/linux/arm64v8/base/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-ARG base_tag=3.1.19-bionic-arm64v8
-FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
-
-# Add an unprivileged user account for running the module
-RUN useradd -ms /bin/bash moduleuser
-USER moduleuser
diff --git a/edge-modules/azure-monitor/docker/linux/arm32v7/Dockerfile b/edge-modules/azure-monitor/docker/linux/arm32v7/Dockerfile
index fd7b0ae6db7..7435a441993 100644
--- a/edge-modules/azure-monitor/docker/linux/arm32v7/Dockerfile
+++ b/edge-modules/azure-monitor/docker/linux/arm32v7/Dockerfile
@@ -1,5 +1,9 @@
-ARG base_tag=1.0.5.14-linux-arm32v7
-FROM azureiotedge/azureiotedge-module-base:${base_tag}
+ARG base_tag=3.1.19-bionic-arm32v7
+FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
+
+# Add an unprivileged user account for running the module
+RUN useradd -ms /bin/bash moduleuser
+USER moduleuser
 
 ARG EXE_DIR=.
 
diff --git a/edge-modules/azure-monitor/docker/linux/arm64v8/Dockerfile b/edge-modules/azure-monitor/docker/linux/arm64v8/Dockerfile
index 7721bdaa847..cef172233e5 100644
--- a/edge-modules/azure-monitor/docker/linux/arm64v8/Dockerfile
+++ b/edge-modules/azure-monitor/docker/linux/arm64v8/Dockerfile
@@ -1,5 +1,9 @@
-ARG base_tag=1.0.5.14-linux-arm64v8
-FROM azureiotedge/azureiotedge-module-base:${base_tag}
+ARG base_tag=3.1.19-bionic-arm64v8
+FROM mcr.microsoft.com/dotnet/runtime:${base_tag}
+
+# Add an unprivileged user account for running the module
+RUN useradd -ms /bin/bash moduleuser
+USER moduleuser
 
 ARG EXE_DIR=.