diff --git a/etc/heat/api-paste.ini b/etc/heat/api-paste.ini
index 8afcd66bd0..72e5e579a4 100644
--- a/etc/heat/api-paste.ini
+++ b/etc/heat/api-paste.ini
@@ -26,10 +26,20 @@ pipeline = versionnegotiation context custombackendauth apiv1app
 [pipeline:heat-api-cfn]
 pipeline = cfnversionnegotiation ec2authtoken authtoken context apicfnv1app
 
+# heat-api-cfn pipeline for standalone heat
+# relies exclusively on authenticating with ec2 signed requests
+[pipeline:heat-api-cfn-standalone]
+pipeline = cfnversionnegotiation ec2authtoken context apicfnv1app
+
 # heat-api-cloudwatch pipeline
 [pipeline:heat-api-cloudwatch]
 pipeline = versionnegotiation ec2authtoken authtoken context apicwapp
 
+# heat-api-cloudwatch pipeline for standalone heat
+# relies exclusively on authenticating with ec2 signed requests
+[pipeline:heat-api-cloudwatch-standalone]
+pipeline = versionnegotiation ec2authtoken context apicwapp
+
 [app:apiv1app]
 paste.app_factory = heat.common.wsgi:app_factory
 heat.app_factory = heat.api.openstack.v1:API
diff --git a/etc/heat/heat-api-cfn.conf b/etc/heat/heat-api-cfn.conf
index 06e66814f4..35d0a21ea3 100644
--- a/etc/heat/heat-api-cfn.conf
+++ b/etc/heat/heat-api-cfn.conf
@@ -29,6 +29,10 @@ use_syslog = False
 
 rpc_backend=heat.openstack.common.rpc.impl_qpid
 
+# Uncomment to deploy different flavor of heat-api-cfn pipeline:
+# [paste_deploy]
+# flavor = standalone
+
 [keystone_authtoken]
 auth_host = 127.0.0.1
 auth_port = 35357
diff --git a/etc/heat/heat-api-cloudwatch.conf b/etc/heat/heat-api-cloudwatch.conf
index e582631d06..b95b016d89 100644
--- a/etc/heat/heat-api-cloudwatch.conf
+++ b/etc/heat/heat-api-cloudwatch.conf
@@ -27,6 +27,10 @@ bind_port = 8003
 
 rpc_backend=heat.openstack.common.rpc.impl_qpid
 
+# Uncomment to deploy different flavor of heat-api-cloudwatch pipeline:
+# [paste_deploy]
+# flavor = standalone
+
 [keystone_authtoken]
 auth_host = 127.0.0.1
 auth_port = 35357