diff --git a/debian_stable_docker_images.inc b/debian_stable_docker_images.inc
new file mode 100644
index 0000000..b6438ac
--- /dev/null
+++ b/debian_stable_docker_images.inc
@@ -0,0 +1 @@
+stx-snmp-helm
diff --git a/stx-snmp-helm/centos/stx-snmp-helm-fm-subagent.stable_docker_image b/stx-snmp-helm/centos/stx-snmp-helm-fm-subagent.stable_docker_image
index 44d175b..1780a9e 100755
--- a/stx-snmp-helm/centos/stx-snmp-helm-fm-subagent.stable_docker_image
+++ b/stx-snmp-helm/centos/stx-snmp-helm-fm-subagent.stable_docker_image
@@ -1,3 +1,4 @@
 BUILDER=docker
 LABEL=stx-fm-subagent
-DOCKER_CONTEXT=docker/stx-fm-subagent
+DOCKER_CONTEXT=../docker/stx-fm-subagent
+DOCKER_FILE=../docker/stx-fm-subagent/Dockerfile.centos
diff --git a/stx-snmp-helm/centos/stx-snmp-helm-fm-trap-subagent.stable_docker_image b/stx-snmp-helm/centos/stx-snmp-helm-fm-trap-subagent.stable_docker_image
index 06369da..2a06416 100755
--- a/stx-snmp-helm/centos/stx-snmp-helm-fm-trap-subagent.stable_docker_image
+++ b/stx-snmp-helm/centos/stx-snmp-helm-fm-trap-subagent.stable_docker_image
@@ -1,3 +1,4 @@
 BUILDER=docker
 LABEL=stx-fm-trap-subagent
-DOCKER_CONTEXT=docker/stx-fm-trap-subagent
+DOCKER_CONTEXT=../docker/stx-fm-trap-subagent
+DOCKER_FILE=../docker/stx-fm-trap-subagent/Dockerfile.centos
diff --git a/stx-snmp-helm/centos/stx-snmp-helm-snmp.stable_docker_image b/stx-snmp-helm/centos/stx-snmp-helm-snmp.stable_docker_image
index e26335b..6693a2d 100755
--- a/stx-snmp-helm/centos/stx-snmp-helm-snmp.stable_docker_image
+++ b/stx-snmp-helm/centos/stx-snmp-helm-snmp.stable_docker_image
@@ -1,3 +1,4 @@
 BUILDER=docker
 LABEL=stx-snmp
-DOCKER_CONTEXT=docker/stx-snmp
+DOCKER_CONTEXT=../docker/stx-snmp
+DOCKER_FILE=../docker/stx-snmp/Dockerfile.centos
diff --git a/stx-snmp-helm/debian/stx-snmp-helm-fm-subagent.stable_docker_image b/stx-snmp-helm/debian/stx-snmp-helm-fm-subagent.stable_docker_image
new file mode 100755
index 0000000..2fd128f
--- /dev/null
+++ b/stx-snmp-helm/debian/stx-snmp-helm-fm-subagent.stable_docker_image
@@ -0,0 +1,4 @@
+BUILDER=docker
+LABEL=stx-fm-subagent
+DOCKER_CONTEXT=../docker/stx-fm-subagent
+DOCKER_FILE=../docker/stx-fm-subagent/Dockerfile.debian
diff --git a/stx-snmp-helm/debian/stx-snmp-helm-fm-trap-subagent.stable_docker_image b/stx-snmp-helm/debian/stx-snmp-helm-fm-trap-subagent.stable_docker_image
new file mode 100755
index 0000000..682c2e8
--- /dev/null
+++ b/stx-snmp-helm/debian/stx-snmp-helm-fm-trap-subagent.stable_docker_image
@@ -0,0 +1,4 @@
+BUILDER=docker
+LABEL=stx-fm-trap-subagent
+DOCKER_CONTEXT=../docker/stx-fm-trap-subagent
+DOCKER_FILE=../docker/stx-fm-trap-subagent/Dockerfile.debian
diff --git a/stx-snmp-helm/debian/stx-snmp-helm-snmp.stable_docker_image b/stx-snmp-helm/debian/stx-snmp-helm-snmp.stable_docker_image
new file mode 100755
index 0000000..820002a
--- /dev/null
+++ b/stx-snmp-helm/debian/stx-snmp-helm-snmp.stable_docker_image
@@ -0,0 +1,4 @@
+BUILDER=docker
+LABEL=stx-snmp
+DOCKER_CONTEXT=../docker/stx-snmp
+DOCKER_FILE=../docker/stx-snmp/Dockerfile.debian
diff --git a/stx-snmp-helm/centos/docker/stx-fm-subagent/Dockerfile b/stx-snmp-helm/docker/stx-fm-subagent/Dockerfile.centos
similarity index 97%
rename from stx-snmp-helm/centos/docker/stx-fm-subagent/Dockerfile
rename to stx-snmp-helm/docker/stx-fm-subagent/Dockerfile.centos
index 386ea74..320104b 100644
--- a/stx-snmp-helm/centos/docker/stx-fm-subagent/Dockerfile
+++ b/stx-snmp-helm/docker/stx-fm-subagent/Dockerfile.centos
@@ -33,6 +33,7 @@ COPY Makefile .
 COPY ./src/* ./src/
 COPY --from=stx /usr/include/fmDbAPI.h /usr/include/
 COPY --from=stx /usr/include/fmAPI.h /usr/include/
+ENV LIB_DIR=/usr/lib64/
 RUN make
 
 
diff --git a/stx-snmp-helm/docker/stx-fm-subagent/Dockerfile.debian b/stx-snmp-helm/docker/stx-fm-subagent/Dockerfile.debian
new file mode 100644
index 0000000..c47a1bb
--- /dev/null
+++ b/stx-snmp-helm/docker/stx-fm-subagent/Dockerfile.debian
@@ -0,0 +1,41 @@
+ARG BASE
+FROM ${BASE} AS stx
+
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get -y update
+RUN apt-get -y install\
+           fm-common \
+           fm-common-dev
+
+FROM debian AS base
+RUN apt-get -y update
+RUN apt-get -y install\
+           snmp snmpd snmptrapd \
+           libpython2.7 \
+           python3 python3-dev python3-setuptools python-is-python3 \
+           postgresql-13 \
+           libsnmp-dev \
+           libjson-c-dev \
+           gcc \
+           make \
+           uuid-dev
+
+WORKDIR /home/sub-agent
+COPY --from=stx /usr/lib/libfmcommon.so.1.0 /usr/lib/
+
+RUN ln -s  /usr/lib/libfmcommon.so.1.0 /usr/lib/libfmcommon.so
+RUN ln -s  /usr/lib/libfmcommon.so.1.0 /usr/lib/libfmcommon.so.1
+RUN ln -s /usr/lib/libuuid.so.1.3.0 /usr/lib/libuuid.so
+COPY Makefile .
+COPY ./src/* ./src/
+COPY --from=stx /usr/include/fmDbAPI.h /usr/include/
+COPY --from=stx /usr/include/fmAPI.h /usr/include/
+ENV LIB_DIR=/usr/lib/
+RUN make
+
+
+FROM base AS deployment-env
+COPY --from=base /home/sub-agent/snmpSubAgent .
+COPY bootstrap.sh .
+RUN chmod 755 bootstrap.sh
+ENTRYPOINT ["./bootstrap.sh"]
diff --git a/stx-snmp-helm/centos/docker/stx-fm-subagent/Makefile b/stx-snmp-helm/docker/stx-fm-subagent/Makefile
similarity index 84%
rename from stx-snmp-helm/centos/docker/stx-fm-subagent/Makefile
rename to stx-snmp-helm/docker/stx-fm-subagent/Makefile
index e029200..24add00 100644
--- a/stx-snmp-helm/centos/docker/stx-fm-subagent/Makefile
+++ b/stx-snmp-helm/docker/stx-fm-subagent/Makefile
@@ -10,13 +10,15 @@ MIBVER ?= 2.0
 CC=gcc
 DEST_DIR ?= /
 DATA_DIR ?= /usr/share
-LIB_DIR ?= /usr/lib64
+# LIB_DIR = /usr/lib for Debian
+# LIB_DIR = /usr/lib64 for CentOS
+
 BIN=./bin
 SOURCE=./src
 
 SRCS =  $(SOURCE)/snmpSubAgent.c $(SOURCE)/snmpActiveAlarms.c $(SOURCE)/snmpAgentPlugin.c $(SOURCE)/snmpEventLogs.c
 OBJS = $(SRCS:.c=.o)
-LDLIBS = -L/lib/x86_64-linux-gnu/ -L/usr/lib64  -lfmcommon -lnetsnmp
+LDLIBS = -L/lib/x86_64-linux-gnu/ -L$(LIB_DIR)  -lfmcommon -lnetsnmp
 LDLIBS += -lnetsnmpagent -luuid -lnetsnmpmibs  -lnetsnmphelpers
 
 INCLUDES += -I./ -I/include/net-snmp -I$(SOURCE) -I/usr/include/
diff --git a/stx-snmp-helm/centos/docker/stx-fm-subagent/bootstrap.sh b/stx-snmp-helm/docker/stx-fm-subagent/bootstrap.sh
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-fm-subagent/bootstrap.sh
rename to stx-snmp-helm/docker/stx-fm-subagent/bootstrap.sh
diff --git a/stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpActiveAlarms.c b/stx-snmp-helm/docker/stx-fm-subagent/src/snmpActiveAlarms.c
similarity index 99%
rename from stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpActiveAlarms.c
rename to stx-snmp-helm/docker/stx-fm-subagent/src/snmpActiveAlarms.c
index 0984f28..2b584ee 100644
--- a/stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpActiveAlarms.c
+++ b/stx-snmp-helm/docker/stx-fm-subagent/src/snmpActiveAlarms.c
@@ -17,11 +17,11 @@
 #include <fmDbAPI.h>
 #include "snmpAgentPlugin.h"
 
-
-netsnmp_feature_require(date_n_time)
-
 #define MINLOADFREQ 1     /* min reload frequency in seconds */
 
+netsnmp_feature_require(date_n_time);
+
+
 static long Active_Alarm_Count = 0;
 static struct activealarm *alarm_list;
 static struct activealarm *alarmaddr, savealarm, *savealarmaddr;
diff --git a/stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpAgentPlugin.c b/stx-snmp-helm/docker/stx-fm-subagent/src/snmpAgentPlugin.c
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpAgentPlugin.c
rename to stx-snmp-helm/docker/stx-fm-subagent/src/snmpAgentPlugin.c
diff --git a/stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpAgentPlugin.h b/stx-snmp-helm/docker/stx-fm-subagent/src/snmpAgentPlugin.h
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpAgentPlugin.h
rename to stx-snmp-helm/docker/stx-fm-subagent/src/snmpAgentPlugin.h
diff --git a/stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpEventLogs.c b/stx-snmp-helm/docker/stx-fm-subagent/src/snmpEventLogs.c
similarity index 99%
rename from stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpEventLogs.c
rename to stx-snmp-helm/docker/stx-fm-subagent/src/snmpEventLogs.c
index b7cf84c..eb33ede 100644
--- a/stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpEventLogs.c
+++ b/stx-snmp-helm/docker/stx-fm-subagent/src/snmpEventLogs.c
@@ -17,11 +17,11 @@
 #include <fmDbAPI.h>
 #include "snmpAgentPlugin.h"
 
-
-netsnmp_feature_require(date_n_time)
-
 #define MINLOADFREQ 2     /* min reload frequency in seconds */
 
+netsnmp_feature_require(date_n_time);
+
+
 static long Event_Log_Count = 0;
 static struct activealarm *alarm_list;
 static struct activealarm *alarmaddr, savealarm, *savealarmaddr;
diff --git a/stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpSubAgent.c b/stx-snmp-helm/docker/stx-fm-subagent/src/snmpSubAgent.c
similarity index 98%
rename from stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpSubAgent.c
rename to stx-snmp-helm/docker/stx-fm-subagent/src/snmpSubAgent.c
index 64a1551..c273c73 100644
--- a/stx-snmp-helm/centos/docker/stx-fm-subagent/src/snmpSubAgent.c
+++ b/stx-snmp-helm/docker/stx-fm-subagent/src/snmpSubAgent.c
@@ -24,8 +24,8 @@
  * --with-features="agent_check_and_process enable_stderrlog" to your
  * configure line.
  */
-netsnmp_feature_require(agent_check_and_process)
-netsnmp_feature_require(enable_stderrlog)
+netsnmp_feature_require(agent_check_and_process);
+netsnmp_feature_require(enable_stderrlog);
 
 static int keep_running;
 
diff --git a/stx-snmp-helm/centos/docker/stx-fm-trap-subagent/Dockerfile b/stx-snmp-helm/docker/stx-fm-trap-subagent/Dockerfile.centos
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-fm-trap-subagent/Dockerfile
rename to stx-snmp-helm/docker/stx-fm-trap-subagent/Dockerfile.centos
diff --git a/stx-snmp-helm/docker/stx-fm-trap-subagent/Dockerfile.debian b/stx-snmp-helm/docker/stx-fm-trap-subagent/Dockerfile.debian
new file mode 100644
index 0000000..e69de29
diff --git a/stx-snmp-helm/centos/docker/stx-fm-trap-subagent/Makefile b/stx-snmp-helm/docker/stx-fm-trap-subagent/Makefile
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-fm-trap-subagent/Makefile
rename to stx-snmp-helm/docker/stx-fm-trap-subagent/Makefile
diff --git a/stx-snmp-helm/centos/docker/stx-fm-trap-subagent/bootstrap.sh b/stx-snmp-helm/docker/stx-fm-trap-subagent/bootstrap.sh
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-fm-trap-subagent/bootstrap.sh
rename to stx-snmp-helm/docker/stx-fm-trap-subagent/bootstrap.sh
diff --git a/stx-snmp-helm/centos/docker/stx-fm-trap-subagent/src/wrsAlarmMIBServer.c b/stx-snmp-helm/docker/stx-fm-trap-subagent/src/wrsAlarmMIBServer.c
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-fm-trap-subagent/src/wrsAlarmMIBServer.c
rename to stx-snmp-helm/docker/stx-fm-trap-subagent/src/wrsAlarmMIBServer.c
diff --git a/stx-snmp-helm/centos/docker/stx-fm-trap-subagent/src/wrsAlarmMIBServer.h b/stx-snmp-helm/docker/stx-fm-trap-subagent/src/wrsAlarmMIBServer.h
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-fm-trap-subagent/src/wrsAlarmMIBServer.h
rename to stx-snmp-helm/docker/stx-fm-trap-subagent/src/wrsAlarmMIBServer.h
diff --git a/stx-snmp-helm/centos/docker/stx-fm-trap-subagent/src/wrsAlarmMIBSubagent.c b/stx-snmp-helm/docker/stx-fm-trap-subagent/src/wrsAlarmMIBSubagent.c
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-fm-trap-subagent/src/wrsAlarmMIBSubagent.c
rename to stx-snmp-helm/docker/stx-fm-trap-subagent/src/wrsAlarmMIBSubagent.c
diff --git a/stx-snmp-helm/centos/docker/stx-fm-trap-subagent/src/wrsAlarmMIBTrap.c b/stx-snmp-helm/docker/stx-fm-trap-subagent/src/wrsAlarmMIBTrap.c
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-fm-trap-subagent/src/wrsAlarmMIBTrap.c
rename to stx-snmp-helm/docker/stx-fm-trap-subagent/src/wrsAlarmMIBTrap.c
diff --git a/stx-snmp-helm/centos/docker/stx-fm-trap-subagent/src/wrsAlarmMIBTrap.h b/stx-snmp-helm/docker/stx-fm-trap-subagent/src/wrsAlarmMIBTrap.h
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-fm-trap-subagent/src/wrsAlarmMIBTrap.h
rename to stx-snmp-helm/docker/stx-fm-trap-subagent/src/wrsAlarmMIBTrap.h
diff --git a/stx-snmp-helm/centos/docker/stx-snmp/Dockerfile b/stx-snmp-helm/docker/stx-snmp/Dockerfile.centos
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-snmp/Dockerfile
rename to stx-snmp-helm/docker/stx-snmp/Dockerfile.centos
diff --git a/stx-snmp-helm/docker/stx-snmp/Dockerfile.debian b/stx-snmp-helm/docker/stx-snmp/Dockerfile.debian
new file mode 100755
index 0000000..e69de29
diff --git a/stx-snmp-helm/centos/docker/stx-snmp/mibs/wrsAlarmMib.mib.txt b/stx-snmp-helm/docker/stx-snmp/mibs/wrsAlarmMib.mib.txt
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-snmp/mibs/wrsAlarmMib.mib.txt
rename to stx-snmp-helm/docker/stx-snmp/mibs/wrsAlarmMib.mib.txt
diff --git a/stx-snmp-helm/centos/docker/stx-snmp/mibs/wrsEnterpriseReg.mib.txt b/stx-snmp-helm/docker/stx-snmp/mibs/wrsEnterpriseReg.mib.txt
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-snmp/mibs/wrsEnterpriseReg.mib.txt
rename to stx-snmp-helm/docker/stx-snmp/mibs/wrsEnterpriseReg.mib.txt
diff --git a/stx-snmp-helm/centos/docker/stx-snmp/src/Makefile b/stx-snmp-helm/docker/stx-snmp/src/Makefile
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-snmp/src/Makefile
rename to stx-snmp-helm/docker/stx-snmp/src/Makefile
diff --git a/stx-snmp-helm/centos/docker/stx-snmp/src/snmpAuditPlugin.c b/stx-snmp-helm/docker/stx-snmp/src/snmpAuditPlugin.c
similarity index 100%
rename from stx-snmp-helm/centos/docker/stx-snmp/src/snmpAuditPlugin.c
rename to stx-snmp-helm/docker/stx-snmp/src/snmpAuditPlugin.c