diff --git a/debian_stable_docker_images.inc b/debian_stable_docker_images.inc
new file mode 100644
index 00000000..ce6f525c
--- /dev/null
+++ b/debian_stable_docker_images.inc
@@ -0,0 +1 @@
+tools/rvmc
diff --git a/tools/rvmc/centos/docker/Dockerfile b/tools/rvmc/centos/Dockerfile
similarity index 99%
rename from tools/rvmc/centos/docker/Dockerfile
rename to tools/rvmc/centos/Dockerfile
index 5cdcb9ec..2ea94690 100644
--- a/tools/rvmc/centos/docker/Dockerfile
+++ b/tools/rvmc/centos/Dockerfile
@@ -7,4 +7,3 @@ COPY rvmc.py /usr/local/bin
 ENV debug=0
 ENV target=None
 ENTRYPOINT /usr/local/bin/rvmc.py --target $target --debug $debug
-
diff --git a/tools/rvmc/centos/rvmc.stable_docker_image b/tools/rvmc/centos/rvmc.stable_docker_image
index d5f65494..ba46a0a4 100644
--- a/tools/rvmc/centos/rvmc.stable_docker_image
+++ b/tools/rvmc/centos/rvmc.stable_docker_image
@@ -1,2 +1,4 @@
 BUILDER=docker
 LABEL=rvmc
+DOCKER_CONTEXT=../docker
+DOCKER_FILE=./Dockerfile
diff --git a/tools/rvmc/debian/Dockerfile b/tools/rvmc/debian/Dockerfile
new file mode 100644
index 00000000..d11fdfe0
--- /dev/null
+++ b/tools/rvmc/debian/Dockerfile
@@ -0,0 +1,19 @@
+ARG BASE
+FROM ${BASE}
+
+ENV debug=0
+ENV target=None
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get -y update \
+    && apt-get -y install \
+    iproute2 \
+    iputils-ping \
+    python3-pip \
+    ntp \
+    time
+RUN pip3 install pyyaml \
+    && pip3 install redfish
+
+COPY ./rvmc.py /usr/local/bin
+ENTRYPOINT /usr/local/bin/rvmc.py --target $target --debug $debug
diff --git a/tools/rvmc/debian/rvmc.stable_docker_image b/tools/rvmc/debian/rvmc.stable_docker_image
new file mode 100644
index 00000000..ba46a0a4
--- /dev/null
+++ b/tools/rvmc/debian/rvmc.stable_docker_image
@@ -0,0 +1,4 @@
+BUILDER=docker
+LABEL=rvmc
+DOCKER_CONTEXT=../docker
+DOCKER_FILE=./Dockerfile
diff --git a/tools/rvmc/centos/docker/examples/rvmc_job.yaml b/tools/rvmc/docker/examples/rvmc_job.yaml
similarity index 100%
rename from tools/rvmc/centos/docker/examples/rvmc_job.yaml
rename to tools/rvmc/docker/examples/rvmc_job.yaml
diff --git a/tools/rvmc/centos/docker/examples/rvmc_multi_target_config_example.yaml b/tools/rvmc/docker/examples/rvmc_multi_target_config_example.yaml
similarity index 100%
rename from tools/rvmc/centos/docker/examples/rvmc_multi_target_config_example.yaml
rename to tools/rvmc/docker/examples/rvmc_multi_target_config_example.yaml
diff --git a/tools/rvmc/centos/docker/examples/rvmc_pod.yaml b/tools/rvmc/docker/examples/rvmc_pod.yaml
similarity index 100%
rename from tools/rvmc/centos/docker/examples/rvmc_pod.yaml
rename to tools/rvmc/docker/examples/rvmc_pod.yaml
diff --git a/tools/rvmc/centos/docker/examples/rvmc_single_target_config_example.yaml b/tools/rvmc/docker/examples/rvmc_single_target_config_example.yaml
similarity index 100%
rename from tools/rvmc/centos/docker/examples/rvmc_single_target_config_example.yaml
rename to tools/rvmc/docker/examples/rvmc_single_target_config_example.yaml
diff --git a/tools/rvmc/centos/docker/rvmc.py b/tools/rvmc/docker/rvmc.py
similarity index 100%
rename from tools/rvmc/centos/docker/rvmc.py
rename to tools/rvmc/docker/rvmc.py
diff --git a/tox.ini b/tox.ini
index ef86ed49..8e2ee447 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,7 +48,7 @@ deps = {[testenv]deps}
        pylint
 commands =
      pylint {posargs} --rcfile=./pylint.rc \
-         tools/rvmc/centos/docker/rvmc.py \
+         tools/rvmc/docker/rvmc.py \
          mtce/src/hwmon/scripts/hwmond_notify.py
 
 [testenv:pep8]