diff --git a/admin-guide/puppet/components/logrotate.rst b/admin-guide/puppet/components/logrotate.rst
index 3a679153..54af3a68 100644
--- a/admin-guide/puppet/components/logrotate.rst
+++ b/admin-guide/puppet/components/logrotate.rst
@@ -1,5 +1,5 @@
 ``logrotate``
-===========
+=============
 
 This module configures ``logrotate``. Further information an examples can be
 found in the following link:
diff --git a/admin-guide/puppet/profiles/grafana.rst b/admin-guide/puppet/profiles/grafana.rst
index a80e6e93..66427986 100644
--- a/admin-guide/puppet/profiles/grafana.rst
+++ b/admin-guide/puppet/profiles/grafana.rst
@@ -1,5 +1,5 @@
 ``profile::grafana``
-============================
+====================
 
 This module installs and configures Grafana server.
 It requires a SSL cert/key since the server will be provided over HTTPS.
@@ -25,7 +25,7 @@ key                              string    hiera('grafana::tls_key')
 
 
 ``vhost``
-~~~~~~~~
+~~~~~~~~~
 
 The hostname through which the server will provide http/https service.
 By default it corresponds to the FQDN, but in case of aliases or Round-Robin DNS it can be different.
@@ -47,7 +47,7 @@ The list of unix groups that will have full (admin) rights when logging into the
 See `this <http://docs.grafana.org/installation/ldap/>`_ for further details.ls.
 
 ``editor_groups``
-~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~
 
 The list of unix groups that will have editor rights when logging into the server.
 See `this <http://docs.grafana.org/installation/ldap/>`_ for further details.
diff --git a/admin-guide/puppet/profiles/icinga/checks/gpfs.rst b/admin-guide/puppet/profiles/icinga/checks/gpfs.rst
index 9c9a0d50..56ba649d 100644
--- a/admin-guide/puppet/profiles/icinga/checks/gpfs.rst
+++ b/admin-guide/puppet/profiles/icinga/checks/gpfs.rst
@@ -1,5 +1,5 @@
 ``profile::icinga::checks::gpfs``
-========================================
+=================================
 
 This profile is called when ``gpfs`` is being configured. 
 
@@ -18,7 +18,7 @@ check_ignore_tips    Boolean     ``icinga::checks::options::gpfs::unhealth:`` **
 ===================  ==========  =============================================================
 
 ``check_unhealth_only``
-~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~
 
 By default ``mmhealth`` is called with the option ``--unhealth``. This shows only **unhealthy** problems. This can be disabled
 by setting ``icinga::checks::options::gpfs::unhealth: false``, in this case ``mmhealth`` will also report about **healthy** checks.
diff --git a/admin-guide/puppet/profiles/icinga/checks/hp/smart_array.rst b/admin-guide/puppet/profiles/icinga/checks/hp/smart_array.rst
index 2ebff095..18c58a2a 100644
--- a/admin-guide/puppet/profiles/icinga/checks/hp/smart_array.rst
+++ b/admin-guide/puppet/profiles/icinga/checks/hp/smart_array.rst
@@ -1,5 +1,5 @@
 ``profile::icinga::checks::hp::smart_array``
-========================================
+============================================
 
 This profile is automatically called when a HP Smart Array is detected through facter from the
 ``profile::platform::hewlett_packard`` class. 
diff --git a/admin-guide/puppet/profiles/icinga/checks/puppet_client.rst b/admin-guide/puppet/profiles/icinga/checks/puppet_client.rst
index 68bd429b..750aab42 100644
--- a/admin-guide/puppet/profiles/icinga/checks/puppet_client.rst
+++ b/admin-guide/puppet/profiles/icinga/checks/puppet_client.rst
@@ -1,5 +1,5 @@
 ``profile::icinga::checks::puppet_client``
-========================================
+==========================================
 
 This profile is called when ``puppet`` client is being configured. 
 
diff --git a/admin-guide/puppet/profiles/icinga/client.rst b/admin-guide/puppet/profiles/icinga/client.rst
index f650de3e..4841e1c8 100644
--- a/admin-guide/puppet/profiles/icinga/client.rst
+++ b/admin-guide/puppet/profiles/icinga/client.rst
@@ -1,5 +1,5 @@
 ``profile::icinga::client``
-==========================
+===========================
 
 This profile installs and configured the ``nrpe`` service:
   * Installs ``mod_gearman-static``, ``nrpe-selinux``, ``nrpe``
@@ -26,7 +26,7 @@ blame              Array       hiera('icinga::client::dont_blame_nrpe', 0)
 =================  ==========  =========================================================
 
 ``servers``
-~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~
 
 The local parameter for ``icinga::client::servers`` is ``servers``. Defaults to ``[ 'emonma00.psi.ch','wmonag00.psi.ch','emonag00.psi.ch' ]``
 which is the default value in the ``nrpe.cfg`` file on fresh ``nrpe`` installations. Somebody can 
diff --git a/admin-guide/puppet/profiles/jupyterhub.rst b/admin-guide/puppet/profiles/jupyterhub.rst
index e86fd822..6f0af201 100644
--- a/admin-guide/puppet/profiles/jupyterhub.rst
+++ b/admin-guide/puppet/profiles/jupyterhub.rst
@@ -1,5 +1,5 @@
 ``profile::jupyterhub``
-=====================
+=======================
 
 This module configures the node for running a jupyterhub service
 able to spawn singleuser servers on cluster nodes via SLURM
@@ -128,11 +128,11 @@ Example:
       'gpu' : 'GPU nodes'
 
 tls_cert
-~~~~~~~~~
+~~~~~~~~
 
 String (PEM Format) of the web server certificate 
 
 tls_key
-~~~~~~~~
+~~~~~~~
 
 Eyaml encoded string of the web server certificate key (PEM format)
diff --git a/admin-guide/puppet/profiles/mkresource/files.rst b/admin-guide/puppet/profiles/mkresource/files.rst
index 685fc7cb..44d8e0a3 100644
--- a/admin-guide/puppet/profiles/mkresource/files.rst
+++ b/admin-guide/puppet/profiles/mkresource/files.rst
@@ -70,7 +70,7 @@ $defaults   Hash                  {}
 
 
 ``files``
-~~~~~~~~~~~~~
+~~~~~~~~~
 Defaults to ``Hash`` type ``{}``. Whenever is an ``Array``, it will be converted to ``Hash`` as ``create_resources`` is used and
 it always expects a ``Hash``.
 
@@ -96,7 +96,7 @@ Two different call examples:
      - '/ssd-scratch'
 
 ``defaults``
-~~~~~~~~~
+~~~~~~~~~~~~
 
 Defaults to empty ``Hash``. Should contain ``file`` resource parameters (in example, ``mode``, ``owner``, ``group``, ``ensure``, etc.)
 Example::