diff --git a/Configuration.md b/Configuration.md
index 888d3f1..3065476 100644
--- a/Configuration.md
+++ b/Configuration.md
@@ -48,6 +48,27 @@
 * LOAD_BALANCER_SCHEME: Optional. The Load Balancer scheme type. `internet-facing` by default.
   Allowed values: internal, internet-facing
 
+#### 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.
+
 #### LDAP
 
 Configuration values related to LDAP integration.
diff --git a/dual-master/README.md b/dual-master/README.md
index 3e7fc22..2c52c98 100644
--- a/dual-master/README.md
+++ b/dual-master/README.md
@@ -57,7 +57,7 @@
 ### Monitoring
 
 * Standard CloudWatch monitoring metrics for each component
-* Application level CloudWatch monitoring can be enabled as described [here](#cloudwatch-monitoring)
+* Application level CloudWatch monitoring can be enabled as described [here](../Configuration.md#cloudwatch-monitoring)
 * Prometheus and Grafana stack is currently not available for dual-master, but a change is in progress to allow this
  (see [Issue 12979](https://bugs.chromium.org/p/gerrit/issues/detail?id=12979))
 
@@ -93,27 +93,6 @@
 * `FILESYSTEM_PROVISIONED_THROUGHPUT_IN_MIBPS`: Optional. Only used when `FILESYSTEM_THROUGHPUT_MODE` is set to `provisioned`.
 default: `256`.
 
-#### 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/README.md b/master-slave/README.md
index d6706e5..644b7ff 100644
--- a/master-slave/README.md
+++ b/master-slave/README.md
@@ -51,7 +51,7 @@
 ### Monitoring
 
 * Standard CloudWatch monitoring metrics for each component
-* Application level CloudWatch monitoring can be enabled as described [here](#cloudwatch-monitoring)
+* Application level CloudWatch monitoring can be enabled as described [here](../Configuration.md#cloudwatch-monitoring)
 
 ## How to run it
 
@@ -82,27 +82,6 @@
 * `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/single-master/README.md b/single-master/README.md
index c703d85..27e8bbd 100644
--- a/single-master/README.md
+++ b/single-master/README.md
@@ -45,7 +45,7 @@
 ### Monitoring
 
 * Standard CloudWatch monitoring metrics for each component
-* Application level CloudWatch monitoring can be enabled as described [here](#cloudwatch-monitoring)
+* Application level CloudWatch monitoring can be enabled as described [here](../Configuration.md#cloudwatch-monitoring)
 * Prometheus and Grafana stack is not available for this recipe yet. However the work has been done for
 the dual-master recipe and it could be easily adapted (you can find the relevant issue
 [here](https://bugs.chromium.org/p/gerrit/issues/detail?id=13092)).
@@ -73,27 +73,6 @@
 
 * `SERVICE_STACK_NAME`: Optional. Name of the service stack. `gerrit-service` by default.
 
-#### 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, service and DNS routing stacks: