diff --git a/docker/Dockerfile.alarm-generator b/docker/Dockerfile.alarm-generator
new file mode 100644
index 0000000..933bc89
--- /dev/null
+++ b/docker/Dockerfile.alarm-generator
@@ -0,0 +1,34 @@
+# Copyright 2016 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
+
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
+
+MAINTAINER Voltha Community <info@opennetworking.org>
+
+# Bundle app source
+RUN mkdir /alarm-generator && touch /alarm-generator/__init__.py
+ENV PYTHONPATH=/alarm-generator
+COPY common /alarm-generator/common
+COPY alarm-generator alarm-generator/alarm-generator
+COPY voltha /alarm-generator/voltha
+RUN useradd -b /home -d /home/voltha voltha -s /bin/bash
+RUN mkdir /home/voltha
+RUN chown voltha.voltha /home/voltha
+RUN echo "export VISIBLE=now" >> /etc/profile
+
+# Exposing process and default entry point
+ENTRYPOINT ["/usr/bin/dumb-init", "python", "/alarm-generator/alarm-generator/main.py"]
diff --git a/docker/Dockerfile.alarm-generator_d b/docker/Dockerfile.alarm-generator_d
new file mode 100644
index 0000000..eaad62a
--- /dev/null
+++ b/docker/Dockerfile.alarm-generator_d
@@ -0,0 +1,38 @@
+# Copyright 2016 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+ARG TAG=latest
+ARG REGISTRY=
+ARG REPOSITORY=
+
+FROM ${REGISTRY}${REPOSITORY}voltha-protos:${TAG} as protos
+FROM ${REGISTRY}${REPOSITORY}voltha-base:${TAG}
+
+MAINTAINER Voltha Community <info@opennetworking.org>
+
+# Bundle app source
+RUN mkdir /alarm-generator && touch /alarm-generator/__init__.py
+ENV PYTHONPATH=/alarm-generator
+COPY common /alarm-generator/common
+COPY alarm-generator alarm-generator/alarm-generator
+COPY voltha /alarm-generator/voltha
+COPY --from=protos /protos/voltha /alarm-generator/voltha/protos
+COPY --from=protos /protos/google/api /alarm-generator/voltha/protos/third_party/google/api
+COPY --from=protos /protos/asfvolt16_olt /alarm-generator/voltha/adapters/asfvolt16_olt/protos
+RUN useradd -b /home -d /home/voltha voltha -s /bin/bash
+RUN mkdir /home/voltha
+RUN chown voltha.voltha /home/voltha
+RUN echo "export VISIBLE=now" >> /etc/profile
+
+# Exposing process and default entry point
+ENTRYPOINT ["/usr/bin/dumb-init", "python", "/alarm-generator/alarm-generator/main.py"]