diff --git a/{{cookiecutter.directory_name}}/source/get_started.rst b/{{cookiecutter.directory_name}}/source/get_started.rst
index e07748c..0b1a052 100644
--- a/{{cookiecutter.directory_name}}/source/get_started.rst
+++ b/{{cookiecutter.directory_name}}/source/get_started.rst
@@ -1,7 +1,13 @@
-=========================
-{{cookiecutter.service}} service overview
-=========================
-
+{%- macro set_header_markup(header_text_length) -%}
+{%- set servicelength = cookiecutter.service|length -%}
+{%- for _ in range(0, servicelength + header_text_length) -%}={%- endfor -%}
+{%- endmacro -%}
+{%- macro set_header(header_text) -%}
+{{ set_header_markup(header_text|length) }}
+{{cookiecutter.service}}{{header_text}}
+{{ set_header_markup(header_text|length) }}
+{%- endmacro -%}
+{{ set_header(" service overview") }}
 The {{cookiecutter.service}} service provides...
 
 The {{cookiecutter.service}} service consists of the following components:
diff --git a/{{cookiecutter.directory_name}}/source/index.rst b/{{cookiecutter.directory_name}}/source/index.rst
index 01d4936..af7a9cd 100644
--- a/{{cookiecutter.directory_name}}/source/index.rst
+++ b/{{cookiecutter.directory_name}}/source/index.rst
@@ -1,6 +1,13 @@
-=====================
-{{cookiecutter.service}} service
-=====================
+{%- macro set_header_markup(header_text_length) -%}
+{%- set servicelength = cookiecutter.service|length -%}
+{%- for _ in range(0, servicelength + header_text_length) -%}={%- endfor -%}
+{%- endmacro -%}
+{%- macro set_header(header_text) -%}
+{{ set_header_markup(header_text|length) }}
+{{cookiecutter.service}}{{header_text}}
+{{ set_header_markup(header_text|length) }}
+{%- endmacro -%}
+{{ set_header(" service") }}
 
 .. toctree::
    :maxdepth: 2