diff --git a/voltha/templates/alarm-generator.yaml b/voltha/templates/alarm-generator.yaml
new file mode 100644
index 0000000..cef01ac
--- /dev/null
+++ b/voltha/templates/alarm-generator.yaml
@@ -0,0 +1,47 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# 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.
+
+{{- if .Values.alarm_generator_enable }}
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+  name: alarm-generator
+  namespace: {{ .Values.global.namespace }}
+  serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
+spec:
+  replicas: {{ .Values.replicas.alarm_generator }}
+  template:
+    metadata:
+      labels:
+        app: alarm-generator
+      annotations:
+        cni: "calico"
+    spec:
+      serviceAccountName: {{ .Values.global.namespace }}-serviceaccount
+      containers:
+        - name: alarm-generator
+          image: {{ .Values.alarmGeneratorImage }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          env:
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          args:
+{{ toYaml .Values.alarm_generator_args |  indent 12 }}
+{{- end }}
diff --git a/voltha/values.yaml b/voltha/values.yaml
index dec2e1d..c3e43cb 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -23,6 +23,7 @@
   ofagent: 1
   netconf: 1
   envoy_for_etcd: 1
+  alarm_generator: 1
 
 
 node_ports:
@@ -70,6 +71,7 @@
 vcoreImage: 'voltha/voltha-voltha:1.4.0'
 httpBackendImage: 'gcr.io/google_containers/defaultbackend:1.4'
 ingressControllerImage: 'quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2'
+alarmGeneratorImage: "voltha/voltha-alarm-generator:1.4.0"
 
 # Need the namespace global for kafka
 global:
@@ -94,3 +96,16 @@
 - "-v"
 - "--consul=consul:8500"
 - "--grpc-endpoint=voltha:50555"
+
+# set alarm_generator_enable to true to enable alarm generator container.
+# uncomment the intf_id and onu_id arguments if no olt is physically present, and a fake onu_id should be used.
+
+alarm_generator_enable: false
+alarm_generator_args:
+- "--consul=consul:8500"
+- "--grpc-endpoint=voltha:50555"
+- "--global_request"
+- "--rate=1"
+- "--duration=2"
+#- "--intf_id=0"
+#- "--onu_id=00012bc90d6552dd"