diff --git a/master-slave/Makefile b/master-slave/Makefile
index 525dd40..1b9fec8 100644
--- a/master-slave/Makefile
+++ b/master-slave/Makefile
@@ -41,7 +41,7 @@
 		ParameterKey=SubnetIdProp,ParameterValue=$(SUBNET_ID) \
 		$(CLUSTER_OPTIONAL_PARAMS)
 
-service-master:
+service-master: set-optional-params-metrics-cloudwatch
 ifdef LOAD_BALANCER_SCHEME
 		$(eval SERVICE_OPTIONAL_PARAMS := $(SERVICE_OPTIONAL_PARAMS) ParameterKey=LoadBalancerScheme,ParameterValue=$(LOAD_BALANCER_SCHEME))
 endif
@@ -73,9 +73,10 @@
 		ParameterKey=GerritCPU,ParameterValue=$(GERRIT_CPU) \
 		ParameterKey=GerritHeapLimit,ParameterValue=$(GERRIT_HEAP_LIMIT) \
 		ParameterKey=JgitCacheSize,ParameterValue=$(JGIT_CACHE_SIZE) \
-		$(SERVICE_OPTIONAL_PARAMS)
+		$(SERVICE_OPTIONAL_PARAMS) \
+		$(METRICS_CW_OPTIONAL_PARAMS)
 
-service-slave:
+service-slave: set-optional-params-metrics-cloudwatch
 ifdef LOAD_BALANCER_SCHEME
 		$(eval SERVICE_OPTIONAL_PARAMS := $(SERVICE_OPTIONAL_PARAMS) ParameterKey=LoadBalancerScheme,ParameterValue=$(LOAD_BALANCER_SCHEME))
 endif
@@ -102,7 +103,8 @@
 		ParameterKey=GerritCPU,ParameterValue=$(GERRIT_CPU) \
 		ParameterKey=GerritHeapLimit,ParameterValue=$(GERRIT_HEAP_LIMIT) \
 		ParameterKey=JgitCacheSize,ParameterValue=$(JGIT_CACHE_SIZE) \
-		$(SERVICE_OPTIONAL_PARAMS)
+		$(SERVICE_OPTIONAL_PARAMS) \
+		$(METRICS_CW_OPTIONAL_PARAMS)
 
 dns-routing:
 	$(AWS_FC_COMMAND) create-stack \
diff --git a/master-slave/README.md b/master-slave/README.md
index 43d9fd6..d6706e5 100644
--- a/master-slave/README.md
+++ b/master-slave/README.md
@@ -51,6 +51,7 @@
 ### Monitoring
 
 * Standard CloudWatch monitoring metrics for each component
+* Application level CloudWatch monitoring can be enabled as described [here](#cloudwatch-monitoring)
 
 ## How to run it
 
@@ -81,6 +82,27 @@
 * `PROMETHEUS_SUBDOMAIN`: Optional. Prometheus subdomain. For example: `<AWS_PREFIX>-prometheus`
 * `GRAFANA_SUBDOMAIN`: Optional. Grafana subdomain. For example: `<AWS_PREFIX>-grafana`
 
+#### CloudWatch Monitoring
+
+Application level metrics for CloudWatch are available through the
+[metrics-reporter-cloudwatch](https://gerrit.googlesource.com/plugins/metrics-reporter-cloudwatch/)
+plugin.
+
+* `METRICS_CLOUDWATCH_ENABLED`: Optional - Boolean.
+Whether to publish metrics to CloudWatch. Default: false
+* `METRICS_CLOUDWATCH_NAMESPACE`: Optional - String.
+The CloudWatch namespace for Gerrit metrics. Default: _gerrit_
+* `METRICS_CLOUDWATCH_RATE`: Optional - String.
+The rate at which metrics should be fired to AWS. Default: _60s_
+* `METRICS_CLOUDWATCH_INITIAL_DELAY`: Optional - String.
+The time to delay the first reporting execution. Default: _0_
+* `METRICS_CLOUDWATCH_JVM_ENABLED`: Optional - Boolean.
+Publish JVM metrics. Default: _false_
+* `METRICS_CLOUDWATCH_DRY_RUN`: Optional - Boolean.
+Log.DEBUG the metrics, rather than publishing. Default: _false_
+* `METRICS_CLOUDWATCH_EXCLUDE_METRICS_LIST`: Optional. Comma-separated list.
+ Regex patterns to exclude from publishing. Default: empty string.
+
 ### 2 - Deploy
 
 * Create the cluster, services and DNS routing stacks:
diff --git a/master-slave/cf-service-master.yml b/master-slave/cf-service-master.yml
index fdfb05a..7aff09c 100644
--- a/master-slave/cf-service-master.yml
+++ b/master-slave/cf-service-master.yml
@@ -135,6 +135,37 @@
   SMTPDomain:
       Description: Domain to be used in the From field
       Type: String
+  MetricsCloudwatchEnabled:
+    Description: Whether gerrit metrics should be published to cloudwatch
+    Type: String
+    Default: false
+    AllowedValues: [true, false]
+  MetricsCloudwatchNamespace:
+    Description: The CloudWatch namespace for Gerrit metrics
+    Type: String
+    Default: gerrit
+  MetricsCloudwatchRate:
+    Description: The rate at which metrics should be fired to AWS
+    Type: String
+    Default: 60s
+  MetricsCloudwatchInitialDelay:
+    Description: The time to delay the first reporting execution
+    Type: String
+    Default: 0
+  MetricsCloudwatchJVMEnabled:
+    Description: Whether JVM metrics shoiuld be published to cloudwatch
+    Type: String
+    Default: false
+    AllowedValues: [true, false]
+  MetricsCloudwatchDryRun:
+    Description: The reporter will log.DEBUG the metrics, instead of doing a real POST to CloudWatch
+    Type: String
+    Default: false
+    AllowedValues: [true, false]
+  MetricsCloudwatchExcludeMetrics:
+    Description: Comma separated list of regex patterns to exclude metrics reported to CloudWatch
+    Type: CommaDelimitedList
+    Default: ''
 
 Resources:
     Service:
@@ -204,6 +235,20 @@
                       Value: !Ref SlaveSubdomain
                     - Name: HOSTED_ZONE_NAME
                       Value: !Ref HostedZoneName
+                    - Name: METRICS_CLOUDWATCH_ENABLED
+                      Value: !Ref MetricsCloudwatchEnabled
+                    - Name: METRICS_CLOUDWATCH_NAMESPACE
+                      Value: !Ref MetricsCloudwatchNamespace
+                    - Name: METRICS_CLOUDWATCH_RATE
+                      Value: !Ref MetricsCloudwatchRate
+                    - Name: METRICS_CLOUDWATCH_INITIAL_DELAY
+                      Value: !Ref MetricsCloudwatchInitialDelay
+                    - Name: METRICS_CLOUDWATCH_JVM_ENABLED
+                      Value: !Ref MetricsCloudwatchJVMEnabled
+                    - Name: METRICS_CLOUDWATCH_DRY_RUN
+                      Value: !Ref MetricsCloudwatchDryRun
+                    - Name: METRICS_CLOUDWATCH_EXCLUDE_METRICS_LIST
+                      Value: !Join [',', !Ref MetricsCloudwatchExcludeMetrics]
                   MountPoints:
                     - SourceVolume: !Ref GerritGitVolume
                       ContainerPath: /var/gerrit/git
diff --git a/master-slave/cf-service-slave.yml b/master-slave/cf-service-slave.yml
index 2778b5f..25c8acd 100644
--- a/master-slave/cf-service-slave.yml
+++ b/master-slave/cf-service-slave.yml
@@ -138,6 +138,37 @@
   LDAPGroupBase:
       Description: Root of the tree containing all group objects
       Type: String
+  MetricsCloudwatchEnabled:
+    Description: Whether gerrit metrics should be published to cloudwatch
+    Type: String
+    Default: false
+    AllowedValues: [true, false]
+  MetricsCloudwatchNamespace:
+    Description: The CloudWatch namespace for Gerrit metrics
+    Type: String
+    Default: gerrit
+  MetricsCloudwatchRate:
+    Description: The rate at which metrics should be fired to AWS
+    Type: String
+    Default: 60s
+  MetricsCloudwatchInitialDelay:
+    Description: The time to delay the first reporting execution
+    Type: String
+    Default: 0
+  MetricsCloudwatchJVMEnabled:
+    Description: Whether JVM metrics shoiuld be published to cloudwatch
+    Type: String
+    Default: false
+    AllowedValues: [true, false]
+  MetricsCloudwatchDryRun:
+    Description: The reporter will log.DEBUG the metrics, instead of doing a real POST to CloudWatch
+    Type: String
+    Default: false
+    AllowedValues: [true, false]
+  MetricsCloudwatchExcludeMetrics:
+    Description: Comma separated list of regex patterns to exclude metrics reported to CloudWatch
+    Type: CommaDelimitedList
+    Default: ''
 
 Resources:
     GerritService:
@@ -201,6 +232,20 @@
                       Value: !Ref LDAPAccountBase
                     - Name: LDAP_GROUP_BASE
                       Value: !Ref LDAPGroupBase
+                    - Name: METRICS_CLOUDWATCH_ENABLED
+                      Value: !Ref MetricsCloudwatchEnabled
+                    - Name: METRICS_CLOUDWATCH_NAMESPACE
+                      Value: !Ref MetricsCloudwatchNamespace
+                    - Name: METRICS_CLOUDWATCH_RATE
+                      Value: !Ref MetricsCloudwatchRate
+                    - Name: METRICS_CLOUDWATCH_INITIAL_DELAY
+                      Value: !Ref MetricsCloudwatchInitialDelay
+                    - Name: METRICS_CLOUDWATCH_JVM_ENABLED
+                      Value: !Ref MetricsCloudwatchJVMEnabled
+                    - Name: METRICS_CLOUDWATCH_DRY_RUN
+                      Value: !Ref MetricsCloudwatchDryRun
+                    - Name: METRICS_CLOUDWATCH_EXCLUDE_METRICS_LIST
+                      Value: !Join [',', !Ref MetricsCloudwatchExcludeMetrics]
                   MountPoints:
                     - SourceVolume: !Ref GerritGitVolume
                       ContainerPath: /var/gerrit/git
diff --git a/master-slave/setup.env.template b/master-slave/setup.env.template
index 32fe85e..8bab049 100644
--- a/master-slave/setup.env.template
+++ b/master-slave/setup.env.template
@@ -27,3 +27,11 @@
 SMTP_SERVER:=yoursmtp.yourcompany.com
 SMTP_USER:=smtpuser
 SMTP_DOMAIN:=mail.yourcompany.com
+
+METRICS_CLOUDWATCH_ENABLED:=true
+METRICS_CLOUDWATCH_NAMESPACE:=gerrit
+METRICS_CLOUDWATCH_RATE:=60s
+METRICS_CLOUDWATCH_INITIAL_DELAY:=0s
+METRICS_CLOUDWATCH_JVM_ENABLED:=true
+METRICS_CLOUDWATCH_DRY_RUN:=false
+METRICS_CLOUDWATCH_EXCLUDE_METRICS_LIST:=foo.*,bar.*