diff --git a/doc/qa/source/systemtesting.rst b/doc/qa/source/systemtesting.rst
index ad92799..14348cf 100644
--- a/doc/qa/source/systemtesting.rst
+++ b/doc/qa/source/systemtesting.rst
@@ -1,210 +1,192 @@
 System Test Scenarios
 =====================
 
-**Install plugin and deploy environment**
+Install plugin and deploy environment
+-------------------------------------
 
-=============== =====
-Test Case ID    install_plugin_deploy_env
---------------- -----
-Steps           1. Install plugin using Fuel CLI, refer to the `Installation
-                   Guide <http://docs.openstack.org/developer/fuel-docs/user
-                   docs/fuel-install-guide/plugins/plugins_install_plugins.h
-                   tml>`_
-                #. Ensure plugin is successfully installed, as in the 
-                   `Installation Guide <http://docs.openstack.org/developer/
-                   fuel-docs/userdocs/fuel-install-guide/plugins/plugins_ins
-                   tall_plugins.html>`_
-                #. Create environment with enabled plugin in Fuel Web UI
-                #. Add 3 controller nodes and apply the Controller role to 
-                   all 3, 1 compute node, and 1 Dynatrace Security Gateway 
-                   node
-                #. Run network verification
-                #. Deploy the cluster
-                #. Verify there were no error messages during the deployment
-                #. Run health check
---------------- -----
-Expected Result Plugin is installed successfully. Dynatrace OneAgent is 
-                installed on the controller nodes. Dynatrace Security 
-                Gateway is setup successfully. All OSTF tests pass. 
-                Environment is deployed successfully.
-=============== =====
+**Test Case ID**
 
-**Modifying environment with enabled plugin (remove/add controller nodes)**
+- install_plugin_deploy_env
 
-=============== =====
-Test Case ID    modify_env_with_plugin_remove_add_controller
---------------- -----
-Steps           1. Install plugin using Fuel CLI, refer to the `Installation
-                   Guide <http://docs.openstack.org/developer/fuel-docs/user
-                   docs/fuel-install-guide/plugins/plugins_install_plugins.h
-                   tml>`_
-                #. Ensure plugin is successfully installed, as in the 
-                   `Installation Guide <http://docs.openstack.org/developer/
-                   fuel-docs/userdocs/fuel-install-guide/plugins/plugins_ins
-                   tall_plugins.html>`_
-                #. Create environment with enabled plugin in Fuel Web UI
-                #. Add 3 controller nodes and apply the Controller 
-                   role to all 3, 1 compute node, and 1 Dynatrace Security 
-                   Gateway node
-                #. Run network verification
-                #. Deploy the cluster
-                #. Verify there were no error messages during the deployment
-                #. Run OpenStack health check
-                #. Remove 1 controller node
-                #. Redeploy the cluster
-                #. Run health check
-                #. Add 1 new controller node
-                #. Redeploy the cluster
-                #. Run health check
---------------- -----
-Expected Result Plugin is installed successfully. Dynatrace OneAgent is 
-                installed on the controller nodes. Dynatrace Security 
-                Gateway is setup successfully. All OSTF tests pass. 
-                Environment is deployed successfully. The environment is 
-                redeployed successfully when adding/removing a controller
-                node.
-=============== =====
+**Steps**
 
-**Modifying environment with enabled plugin (remove/add compute nodes)**
+1. Install plugin using Fuel CLI, refer to the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Ensure plugin is successfully installed, as in the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Create environment with enabled plugin in Fuel Web UI
+#. Add 3 controller nodes and apply the Controller role to all 3, 1 compute node, and 1 Dynatrace Security Gateway node
+#. Run network verification
+#. Deploy the cluster
+#. Verify there were no error messages during the deployment
+#. Run health check
 
-=============== =====
-Test Case ID    modify_env_with_plugin_remove_add_compute
---------------- -----
-Steps           1. Install plugin using Fuel CLI, refer to the `Installation
-                   Guide <http://docs.openstack.org/developer/fuel-docs/user
-                   docs/fuel-install-guide/plugins/plugins_install_plugins.h
-                   tml>`_
-                #. Ensure plugin is successfully installed, as in the 
-                   `Installation Guide <http://docs.openstack.org/developer/
-                   fuel-docs/userdocs/fuel-install-guide/plugins/plugins_ins
-                   tall_plugins.html>`_
-                #. Create environment with enabled plugin in Fuel Web UI
-                #. Add 3 controller nodes and apply the Controller 
-                   role to all 3, 1 compute node, and 1 Dynatrace Security 
-                   Gateway node
-                #. Run network verification
-                #. Deploy the cluster
-                #. Verify there were no error messages during the deployment
-                #. Run health check
-                #. Add 1 compute node
-                #. Redeploy the cluster
-                #. Run health check
-                #. Remove 1 compute node
-                #. Redeploy the cluster
-                #. Run health check
---------------- -----
-Expected Result Plugin is installed successfully. Dynatrace OneAgent is 
-                installed on the controller nodes. Dynatrace Security 
-                Gateway is setup successfully. All OSTF tests pass. 
-                Environment is deployed successfully. The environment is 
-                redeployed successfully when adding/removing a compute
-                node.
-=============== =====
+**Expected Result**
 
-**Uninstall of plugin in the deployed environment**
+1. Plugin is installed successfully. 
+#. Dynatrace OneAgent is installed on the controller nodes. 
+#. Dynatrace Security Gateway is setup successfully. 
+#. All OSTF tests pass. 
+#. Environment is deployed successfully.
 
-=============== =====
-Test Case ID    uninstall_plugin_with_deployed_env
---------------- -----
-Steps           1. Install plugin using Fuel CLI, refer to the `Installation
-                   Guide <http://docs.openstack.org/developer/fuel-docs/user
-                   docs/fuel-install-guide/plugins/plugins_install_plugins.h
-                   tml>`_
-                #. Ensure plugin is successfully installed, as in the 
-                   `Installation Guide <http://docs.openstack.org/developer/
-                   fuel-docs/userdocs/fuel-install-guide/plugins/plugins_ins
-                   tall_plugins.html>`_
-                #. Create environment with enabled plugin in Fuel Web UI
-                #. Add 3 controller nodes and apply the Controller 
-                   role to all 3, 1 compute node, and 1 Dynatrace Security 
-                   Gateway node
-                #. Run network verification
-                #. Deploy the cluster
-                #. Verify there were no error messages during the deployment
-                #. Run health check
-                #. Uninstall the plugin with running
-                   ``fuel plugins --remove <plugin-name>==<plugin_version>``
-                #. Ensure that the following output appears in CLI: 
-                   *"400 Client Error: Bad Request (Can't delete 
-                   plugin           which is enabled for some environment.)"*
---------------- -----
-Expected Result Plugin is installed successfully. Dynatrace OneAgent is 
-                installed on the controller nodes. Dynatrace Security 
-                Gateway is setup successfully. All OSTF tests pass. 
-                Environment is deployed successfully. An alert is 
-                displayed when trying to uninstall the plugin.
-=============== =====
 
-**Uninstall of plugin in the non-deployed environment**
+Modifying environment with enabled plugin (remove/add controller nodes)
+-----------------------------------------------------------------------
 
-=============== =====
-Test Case ID    uninstall_plugin
---------------- -----
-Steps           1. Install plugin using Fuel CLI, refer to the `Installation
-                   Guide <http://docs.openstack.org/developer/fuel-docs/user
-                   docs/fuel-install-guide/plugins/plugins_install_plugins.h
-                   tml>`_
-                #. Ensure plugin is successfully installed, as in the 
-                   `Installation Guide <http://docs.openstack.org/developer/
-                   fuel-docs/userdocs/fuel-install-guide/plugins/plugins_ins
-                   tall_plugins.html>`_
-                #. Create environment with enabled plugin in Fuel Web UI
-                #. Add 3 controller nodes and apply the Controller 
-                   role to all 3, 1 compute node, and 1 Dynatrace Security 
-                   Gateway node
-                #. Run network verification
-                #. Delete listed environment
-                #. Uninstall the plugin with running
-                   ``fuel plugins --remove <plugin-name>==<plugin_version>``
---------------- -----
-Expected Result Plugin is installed successfully. The cluster is created and
-                network verification is passed. The plugin is enabled and 
-                configured in the Fuel Web UI. When uninstalling the plugin,
-                no plugin-related elements are left in the environment (e.g.
-                UI elements disappear, Nailgun database is restored to the 
-                default state, no output for command "fuel plugins --list").
-=============== =====
+**Test Case ID** 
 
-**Verify hot-pluggable functionality of the plugin**
+- modify_env_with_plugin_remove_add_controller
+
+**Steps**
+
+1. Install plugin using Fuel CLI, refer to the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Ensure plugin is successfully installed, as in the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Create environment with enabled plugin in Fuel Web UI
+#. Add 3 controller nodes and apply the Controller role to all 3, 1 compute node, and 1 Dynatrace Security Gateway node
+#. Run network verification
+#. Deploy the cluster
+#. Verify there were no error messages during the deployment
+#. Run OpenStack health check
+#. Remove 1 controller node
+#. Redeploy the cluster
+#. Run health check
+#. Add 1 new controller node
+#. Redeploy the cluster
+#. Run health check
+
+**Expected Result**
+
+1. Plugin is installed successfully. 
+#. Dynatrace OneAgent is installed on the controller nodes.
+#. Dynatrace Security Gateway is setup successfully. 
+#. All OSTF tests pass.
+#. Environment is deployed successfully. 
+#. The environment is redeployed successfully when adding/removing a controller node.
+
+
+Modifying environment with enabled plugin (remove/add compute nodes)
+--------------------------------------------------------------------
+
+**Test Case ID**
+
+- modify_env_with_plugin_remove_add_compute
+
+**Steps**
+
+1. Install plugin using Fuel CLI, refer to the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Ensure plugin is successfully installed, as in the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Create environment with enabled plugin in Fuel Web UI
+#. Add 3 controller nodes and apply the Controller role to all 3, 1 compute node, and 1 Dynatrace Security Gateway node
+#. Run network verification
+#. Deploy the cluster
+#. Verify there were no error messages during the deployment
+#. Run health check
+#. Add 1 compute node
+#. Redeploy the cluster
+#. Run health check
+#. Remove 1 compute node
+#. Redeploy the cluster
+#. Run health check
+
+**Expected Result**
+
+1. Plugin is installed successfully.
+#. Dynatrace OneAgent is installed on the controller nodes. 
+#. Dynatrace Security Gateway is setup successfully. 
+#. All OSTF tests pass. 
+#. Environment is deployed successfully. 
+#. The environment is redeployed successfully when adding/removing a compute node.
+
+
+Uninstall of plugin in the deployed environment
+-----------------------------------------------
+
+**Test Case ID**
+
+- uninstall_plugin_with_deployed_env
+
+**Steps**
+
+1. Install plugin using Fuel CLI, refer to the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Ensure plugin is successfully installed, as in the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Create environment with enabled plugin in Fuel Web UI
+#. Add 3 controller nodes and apply the Controller role to all 3, 1 compute node, and 1 Dynatrace Security Gateway node
+#. Run network verification
+#. Deploy the cluster
+#. Verify there were no error messages during the deployment
+#. Run health check
+#. Uninstall the plugin with running ``fuel plugins --remove <plugin-name>==<plugin_version>``
+#. Ensure that the following output appears in CLI: *"400 Client Error: Bad Request (Can't delete plugin which is enabled for some environment.)"*
+
+**Expected Result**
+
+1. Plugin is installed successfully. 
+#. Dynatrace OneAgent is installed on the controller nodes. 
+#. Dynatrace Security Gateway is setup successfully. 
+#. All OSTF tests pass. 
+#. Environment is deployed successfully. 
+#. An alert is displayed when trying to uninstall the plugin.
+
+
+Uninstall of plugin in the non-deployed environment
+---------------------------------------------------
+
+**Test Case ID**
+
+- uninstall_plugin
+
+**Steps**
+
+1. Install plugin using Fuel CLI, refer to the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Ensure plugin is successfully installed, as in the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Create environment with enabled plugin in Fuel Web UI
+#. Add 3 controller nodes and apply the Controller role to all 3, 1 compute node, and 1 Dynatrace Security Gateway node
+#. Run network verification
+#. Delete listed environment
+#. Uninstall the plugin with running ``fuel plugins --remove <plugin-name>==<plugin_version>``
+
+**Expected Result**
+
+1. Plugin is installed successfully. 
+#. The cluster is created and network verification is passed. 
+#. The plugin is enabled and configured in the Fuel Web UI. 
+#. When uninstalling the plugin, no plugin-related elements are left in the environment (e.g. UI elements disappear, Nailgun database is restored to the default state, no output for command "fuel plugins --list").
+
+
+Verify hot-pluggable functionality of the plugin
+------------------------------------------------
+
+**Test Case ID**
+
+- hot_pluggable_plugin
+
+**Steps**
+
+1. Install plugin using Fuel CLI, refer to the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Ensure plugin is successfully installed, as in the `Installation Guide <http://docs.openstack.org/developer/fuel-docs/userdocs/fuel-install-guide/plugins/plugins_install_plugins.html>`_
+#. Create environment with disabled plugin in Fuel Web UI
+#. Add 1 controller node and apply the Controller role and 1 compute node
+#. Run network verification
+#. Deploy the cluster
+#. Verify there were no error messages during the deployment
+#. Run health check
+#. Verify that no Dynatrace processes are running on either the controller node, nor the compute node
+#. Enable the plugin and fill out mandatory fields
+#. Add 2 controller nodes and 1 Dynatrace Security Gateway node
+#. Run network verification
+#. Redeploy the cluster
+#. Verify there were no error messages during the deployment
+#. Run health check
+#. Verify that Dynatrace OneAgent is running on all controller nodes and the Dynatrace Security Gateway was setup successfully
+
+**Expected Result** 
+
+1. Plugin is installed successfully. 
+#. When the plugin is disabled no Dynatrace component is installed. 
+#. It's possible to redeploy the cluster with the plugin activated. 
+#. Then the Dynatrace OneAgent is installed on the controller nodes, the Dynatrace Security Gateway is setup successfully. 
+#. All OSTF tests pass. 
+#. Environment is deployed successfully. 
+#. The environment is redeployed successfully when adding nodes.
 
-=============== =====
-Test Case ID    hot_pluggable_plugin
---------------- -----
-Steps           1. Install plugin using Fuel CLI, refer to the `Installation
-                   Guide <http://docs.openstack.org/developer/fuel-docs/user
-                   docs/fuel-install-guide/plugins/plugins_install_plugins.h
-                   tml>`_
-                #. Ensure plugin is successfully installed, as in the 
-                   `Installation Guide <http://docs.openstack.org/developer/
-                   fuel-docs/userdocs/fuel-install-guide/plugins/plugins_ins
-                   tall_plugins.html>`_
-                #. Create environment with disabled plugin in Fuel Web UI
-                #. Add 1 controller node and apply the Controller 
-                   role and 1 compute node
-                #. Run network verification
-                #. Deploy the cluster
-                #. Verify there were no error messages during the deployment
-                #. Run health check
-                #. Verify that no Dynatrace processes are running on either
-                   the controller node, nor the compute node
-                #. Enable the plugin and fill out mandatory fields
-                #. Add 2 controller nodes and 1 Dynatrace Security Gateway
-                   node
-                #. Run network verification
-                #. Redeploy the cluster
-                #. Verify there were no error messages during the deployment
-                #. Run health check
-                #. Verify that Dynatrace OneAgent is running on all
-                   controller nodes
---------------- -----
-Expected Result Plugin is installed successfully. When the plugin is disabled
-                no Dynatrace component is installed. It's possible to 
-                redeploy the cluster with the plugin activated. Then the 
-                Dynatrace OneAgent is installed on the controller nodes, the 
-                Dynatrace Security Gateway is setup successfully. All OSTF 
-                tests pass. Environment is deployed successfully. The 
-                environment is redeployed successfully when adding nodes.
-=============== =====