diff --git a/common-templates/cf-gerrit-network-stack.yml b/common-templates/cf-gerrit-network-stack.yml
index 16e66bf..e6b3916 100644
--- a/common-templates/cf-gerrit-network-stack.yml
+++ b/common-templates/cf-gerrit-network-stack.yml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deploy a service into an ECS cluster behind a public load balancer.
+Description: Deploy Gerrit network stack
 
 Parameters:
   InternetGatewayIdProp:
diff --git a/common-templates/cf-gerrit-task-execution-role.yml b/common-templates/cf-gerrit-task-execution-role.yml
index 9f1df0b..4a6f7f9 100644
--- a/common-templates/cf-gerrit-task-execution-role.yml
+++ b/common-templates/cf-gerrit-task-execution-role.yml
@@ -1,6 +1,6 @@
 
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deploy a service into an ECS cluster behind a public load balancer.
+Description: Deploy execution role for the Gerrit task
 
 Resources:
     # This is a role which is used by the ECS tasks themselves.
diff --git a/dual-primary/cf-service-primary.yml b/dual-primary/cf-service-primary.yml
index 5206254..0424ab7 100644
--- a/dual-primary/cf-service-primary.yml
+++ b/dual-primary/cf-service-primary.yml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deploy a service into an ECS cluster behind a public load balancer.
+Description: Deploy Gerrit primary to ECS cluster
 Parameters:
   GerritInstanceNumber:
     Description: Whether this is primary1 or primary2
diff --git a/dual-primary/cf-service-replica.yml b/dual-primary/cf-service-replica.yml
index 042376c..352aa98 100644
--- a/dual-primary/cf-service-replica.yml
+++ b/dual-primary/cf-service-replica.yml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deploy a service into an ECS cluster behind a public load balancer.
+Description:  Deploy Gerrit replicas to ECS cluster
 Parameters:
   GerritServiceName:
       Type: String
diff --git a/primary-replica/cf-service-primary.yml b/primary-replica/cf-service-primary.yml
index 902e87f..fc25e5e 100644
--- a/primary-replica/cf-service-primary.yml
+++ b/primary-replica/cf-service-primary.yml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deploy a service into an ECS cluster behind a public load balancer.
+Description: Deploy Gerrit primary to ECS cluster
 Parameters:
   GerritServiceName:
     Type: String
diff --git a/primary-replica/cf-service-replica.yml b/primary-replica/cf-service-replica.yml
index 5f318f4..5a44761 100644
--- a/primary-replica/cf-service-replica.yml
+++ b/primary-replica/cf-service-replica.yml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deploy a service into an ECS cluster behind a public load balancer.
+Description: Deploy Gerrit replicas to ECS cluster
 Parameters:
   GerritServiceName:
       Type: String
diff --git a/single-primary/cf-service.yml b/single-primary/cf-service.yml
index 221ddf5..4592e27 100644
--- a/single-primary/cf-service.yml
+++ b/single-primary/cf-service.yml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Deploy a service into an ECS cluster behind a public load balancer.
+Description: Deploy Gerrit primary to ECS cluster
 Parameters:
   GerritServiceName:
     Type: String