diff --git a/environments/enable-designate.yaml b/environments/enable-designate.yaml
index ed73dabd96..7dd7baa73d 100644
--- a/environments/enable-designate.yaml
+++ b/environments/enable-designate.yaml
@@ -8,7 +8,7 @@
 # description: |
 #   EXPERIMENTAL: This service is not considered ready for production and
 #   should only be used for development and test purposes at this time.
-#   
+#
 #   This environment enables the Designate services.  One of the
 #   designate-config* environment files must also be included.
 resource_registry:
diff --git a/environments/standalone/standalone-overcloud.yaml b/environments/standalone/standalone-overcloud.yaml
index 409678b79f..9a8d9590a3 100644
--- a/environments/standalone/standalone-overcloud.yaml
+++ b/environments/standalone/standalone-overcloud.yaml
@@ -8,7 +8,7 @@
 # description: |
 #   A Heat environment that can be used to deploy a single node all-in-one
 #   node via an Undercloud using the normal Overcloud deployment process.
-#   
+#
 #   By default we only want the following OpenStack services to be enabled:
 #     * Keystone
 #     * Nova (and related)
@@ -19,7 +19,7 @@
 #     * Horizon
 #   This file disables any other OpenStack services that would normally be
 #   enabled.
-#   
+#
 #   openstack overcloud roles generate -o ~/roles_data.yaml Standalone
 parameter_defaults:
   # DNS servers to use for the Overcloud (2 max for some implementations). If not set the nameservers configured in the ctlplane subnet's dns_nameservers attribute will be used.
diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml
index fe32f085d0..cd1bdac51c 100644
--- a/environments/standalone/standalone-tripleo.yaml
+++ b/environments/standalone/standalone-tripleo.yaml
@@ -10,7 +10,7 @@
 #   node via the 'overcloud tripleo deploy' command. This does not
 #   require an Undercloud for the deployment and can be used to deploy
 #   a single node on the local machine.
-#   
+#
 #   By default we only want the following OpenStack services to be enabled:
 #     * Keystone
 #     * Nova (and related)
@@ -21,7 +21,7 @@
 #     * Horizon
 #   This file disables any other OpenStack services that would normally be
 #   enabled.
-#   
+#
 #   openstack overcloud roles generate -o ~/roles_data.yaml Standalone
 parameter_defaults:
   # Set to true to append per network Vips to /etc/hosts on each node.
diff --git a/tripleo_heat_templates/environment_generator.py b/tripleo_heat_templates/environment_generator.py
index dbbac01a95..16ca8fedbc 100755
--- a/tripleo_heat_templates/environment_generator.py
+++ b/tripleo_heat_templates/environment_generator.py
@@ -181,7 +181,10 @@ def _generate_environment(input_env, output_path, parent_env=None):
         env_desc = env.get('description', '')
         env_file.write(u'# description: |\n')
         for line in env_desc.splitlines():
-            env_file.write(u'#   %s\n' % line)
+            if line:
+                env_file.write(u'#   %s\n' % line)
+            else:
+                env_file.write('#\n')
         if parameter_defaults or static_defaults:
             env_file.write(u'parameter_defaults:\n')
             write_params_entry(env_file, parameter_defaults[_PARAMETERS],