diff --git a/tcp_tests/managers/jenkins/client.py b/tcp_tests/managers/jenkins/client.py
index 39c698e..a7c2315 100644
--- a/tcp_tests/managers/jenkins/client.py
+++ b/tcp_tests/managers/jenkins/client.py
@@ -11,41 +11,15 @@
 from requests.exceptions import ConnectionError
 
 
-class JenkinsWrapper(jenkins.Jenkins):
-    """Workaround for the bug:
-       https://bugs.launchpad.net/python-jenkins/+bug/1775047
-    """
-    def _response_handler(self, response):
-        '''Handle response objects'''
-
-        # raise exceptions if occurred
-        response.raise_for_status()
-
-        headers = response.headers
-        if (headers.get('content-length') is None and
-                headers.get('transfer-encoding') is None and
-                (response.status_code == 201 and
-                 headers.get('location') is None) and
-                (response.content is None or len(response.content) <= 0)):
-            # response body should only exist if one of these is provided
-            raise jenkins.EmptyResponseException(
-                "Error communicating with server[%s]: "
-                "empty response" % self.server)
-
-        # Response objects will automatically return unicode encoded
-        # when accessing .text property
-        return response
-
-
 class JenkinsClient(object):
 
     def __init__(self, host=None, username='admin', password='r00tme'):
         host = host or 'http://172.16.44.33:8081'
-        # self.__client = jenkins.Jenkins(
-        self.__client = JenkinsWrapper(
+        self.__client = jenkins.Jenkins(
             host,
             username=username,
             password=password)
+        self.__client._session.verify = False
 
     def jobs(self):
         return self.__client.get_jobs()
diff --git a/tcp_tests/managers/saltmanager.py b/tcp_tests/managers/saltmanager.py
index b2abdce..226f408 100644
--- a/tcp_tests/managers/saltmanager.py
+++ b/tcp_tests/managers/saltmanager.py
@@ -283,34 +283,21 @@
         # before or after time sync.
         self.__api = None
         if not settings.SKIP_SYNC_TIME:
-            cmd = ('service ntp stop;'
-                   'if systemctl is-active --quiet maas-rackd; then'
-                   '  systemctl stop maas-rackd;'
-                   '  touch /tmp/maas-rackd.work;'
-                   'fi;'
-                   'if systemctl is-active --quiet maas-regiond; then'
-                   '  systemctl stop maas-regiond;'
-                   '  touch /tmp/maas-regiond.work;'
-                   'fi;'
-                   'if systemctl is-active --quiet maas-proxy; then'
-                   '  systemctl stop maas-proxy;'
-                   '  touch /tmp/maas-proxy.work;'
-                   'fi;'
-                   'sleep 3;'
+            cmd = ('chmod -x /usr/sbin/ntpd'
+                   'service ntp stop;'
                    # note: maas-rackd will return 'pool' after start
-                   'sed -i \'s/^pool /server /g\' /etc/ntp/maas.conf;'
+                   'sed -i \'s/^pool ntp.ubuntu.com/server ntp.cesnet.cz/g\' '
+                   '/etc/ntp/maas.conf;'
+                   'sed -i \'s/^pool ntp.ubuntu.com/server ntp.cesnet.cz/g\' '
+                   '/etc/ntp.conf;'
                    'if [ -x /usr/sbin/ntpdate ]; then'
-                   '  ntpdate -s ntp.ubuntu.com;'
+                   '  ntpdate -s ntp.cesnet.cz;'
                    'else'
                    '  ntpd -gq;'
                    'fi;'
+                   'chmod +x /usr/sbin/ntpd'
                    'service ntp start;'
-                   'if [ -f /tmp/maas-proxy.work ]; then'
-                   '  systemctl start maas-proxy; fi;'
-                   'if [ -f /tmp/maas-rackd.work ]; then'
-                   '  systemctl start maas-rackd; fi;'
-                   'if [ -f /tmp/maas-regiond.work ]; then'
-                   '  systemctl start maas-regiond; fi;')
+                   'sleep 3; ntpq -pn;')
             self.run_state(
                 tgt,
                 'cmd.run', cmd, timeout=360)  # noqa
@@ -349,13 +336,25 @@
         tgt = 'I@docker:client:stack:jenkins and cfg01*'
         jenkins_params = self.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master")
-        jenkins_port = jenkins_params['port']
-        jenkins_user = jenkins_params['username']
-        jenkins_pass = jenkins_params['password']
+        jenkins_host = jenkins_params.get('host')
+        jenkins_port = jenkins_params.get('port')
+        jenkins_protocol = jenkins_params.get('proto', 'http')
+        jenkins_user = jenkins_params.get('username', 'admin')
+        jenkins_pass = jenkins_params.get('password')
+
+        if not all([jenkins_host,
+                    jenkins_port,
+                    jenkins_protocol,
+                    jenkins_user,
+                    jenkins_pass]):
+            raise LookupError(
+                "Some of the required parameters for Jenkins not set in the "
+                "pillar jenkins:client:master on {0}: {1}"
+                .format(tgt, jenkins_params))
 
         with open(env_jenkins_day01_filename, 'w') as f:
             f.write(
-                'export JENKINS_URL=http://{host}:{port}\n'
+                'export JENKINS_URL={protocol}://{host}:{port}\n'
                 'export JENKINS_USER={user}\n'
                 'export JENKINS_PASS={password}\n'
                 'export JENKINS_START_TIMEOUT=60\n'
@@ -370,8 +369,9 @@
                 '  # Timeout waiting for job in queue to start building"\n'
                 'echo "export JENKINS_BUILD_TIMEOUT=${{JENKINS_BUILD_TIMEOUT}}'
                 '  # Timeout waiting for building job to complete"\n'
-                .format(host=self.host, port=jenkins_port,
-                        user=jenkins_user, password=jenkins_pass)
+                .format(host=jenkins_host, port=jenkins_port,
+                        protocol=jenkins_protocol, user=jenkins_user,
+                        password=jenkins_pass)
             )
 
     def create_env_jenkins_cicd(self):
@@ -390,14 +390,25 @@
                       .format(env_jenkins_cicd_filename, tgt, e.message))
             return
 
-        jenkins_host = jenkins_params['host']
-        jenkins_port = jenkins_params['port']
-        jenkins_user = jenkins_params['username']
-        jenkins_pass = jenkins_params['password']
+        jenkins_host = jenkins_params.get('host')
+        jenkins_port = jenkins_params.get('port')
+        jenkins_protocol = jenkins_params.get('proto', 'http')
+        jenkins_user = jenkins_params.get('username', 'admin')
+        jenkins_pass = jenkins_params.get('password')
+
+        if not all([jenkins_host,
+                    jenkins_port,
+                    jenkins_protocol,
+                    jenkins_user,
+                    jenkins_pass]):
+            raise LookupError(
+                "Some of the required parameters for Jenkins not set in the "
+                "pillar jenkins:client:master on {0}: {1}"
+                .format(tgt, jenkins_params))
 
         with open(env_jenkins_cicd_filename, 'w') as f:
             f.write(
-                'export JENKINS_URL=http://{host}:{port}\n'
+                'export JENKINS_URL={protocol}://{host}:{port}\n'
                 'export JENKINS_USER={user}\n'
                 'export JENKINS_PASS={password}\n'
                 'export JENKINS_START_TIMEOUT=60\n'
@@ -413,7 +424,8 @@
                 'echo "export JENKINS_BUILD_TIMEOUT=${{JENKINS_BUILD_TIMEOUT}}'
                 '  # Timeout waiting for building job to complete"\n'
                 .format(host=jenkins_host, port=jenkins_port,
-                        user=jenkins_user, password=jenkins_pass)
+                        protocol=jenkins_protocol, user=jenkins_user,
+                        password=jenkins_pass)
             )
 
     def create_env_k8s(self):
diff --git a/tcp_tests/report.py b/tcp_tests/report.py
index 8a2a58e..1bc35a3 100644
--- a/tcp_tests/report.py
+++ b/tcp_tests/report.py
@@ -186,7 +186,7 @@
      test(id,name..)]
     """
     LOG.info("Get results for run - {}".format(run.name))
-    results = t_client.results(run, result_type)
+    results = t_client.results(run)
     results_with_test = []
     if result_type == '5':
         ret = [(run, r) for r in results
diff --git a/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-contrail41-sl.yaml b/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-queens-contrail41-sl.yaml
similarity index 93%
rename from tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-contrail41-sl.yaml
rename to tcp_tests/templates/cookied-model-generator/salt_heat-cicd-queens-contrail41-sl.yaml
index 1d0bae8..45c1d14 100644
--- a/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-pike-contrail41-sl.yaml
+++ b/tcp_tests/templates/cookied-model-generator/salt_heat-cicd-queens-contrail41-sl.yaml
@@ -1,9 +1,9 @@
 {% from 'cookied-model-generator/underlay.yaml' import HOSTNAME_CFG01 with context %}
 {% from 'cookied-model-generator/underlay.yaml' import DOMAIN_NAME with context %}
 
-{% set LAB_CONFIG_NAME = 'heat-cicd-pike-contrail41-sl' %}
+{% set LAB_CONFIG_NAME = 'heat-cicd-queens-contrail41-sl' %}
 # Name of the context file (without extension, that is fixed .yaml) used to render the Environment model
-{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME','heat-cicd-pike-contrail41-sl') %}
+{% set ENVIRONMENT_MODEL_INVENTORY_NAME = os_env('ENVIRONMENT_MODEL_INVENTORY_NAME','heat-cicd-queens-contrail41-sl') %}
 # Path to the context files used to render Cluster and Environment models
 {%- set CLUSTER_CONTEXT_NAME = 'salt-context-cookiecutter-contrail.yaml' %}
 {%- set ENVIRONMENT_CONTEXT_NAMES = ['salt-context-environment.yaml', 'salt-context-cookiecutter-contrail.yaml'] %}
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt.yaml b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt.yaml
deleted file mode 100644
index a51a8a9..0000000
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-{% set HOSTNAME_CFG01='cfg01.heat-cicd-pike-contrail41-sl.local' %}
-{% set LAB_CONFIG_NAME='heat-cicd-pike-contrail41-sl' %}
-{% set DOMAIN_NAME='heat-cicd-pike-contrail41-sl.local' %}
-
-# Other salt model repository parameters see in shared-salt.yaml
-
-{% import 'shared-salt.yaml' as SHARED with context %}
-
-{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
-
-{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
-
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
similarity index 98%
rename from tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
rename to tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index 0e3707e..c6ffa99 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -67,8 +67,8 @@
     l8kv0xXAElriC1RE1CNtvoOn/uxyRs+2OnNgBVxtAGqUWVdpm6CD
     -----END RSA PRIVATE KEY-----
   cicd_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC4ELbbhdBkXLOoLnoTJLvKv+uWlFFiyva+OLvt9qhZAWaBhtmh7Kqqqbx5I3QJzTACfFaxDsfdk325OfJZWuyiCzW/Hzn3uKitkBPgy7okNuRaVmEhQej0/2K1Yl1RanGMNq+oi+Nmj4OY47WZ+/0rVqw/wI5qdASyAdLK5/5cowGDSSiQRqaYBS1L0dHEIAnjtCAs9IIWKPmKH8xFZjcdYVQUQXeBF1Sh1aZ4k2Zb7skftPbAh3WSfyhHJrt5p0rF3rARoIabkgtfDBUWYWQ4aUR4LzAeduRq138DncPHNR84cGLbsZp/zcM/EqoNZbRoCHtvj0ScWF2S4XdnJdtj
-  cluster_domain: heat-cicd-pike-contrail41-sl.local
-  cluster_name: heat-cicd-pike-contrail41-sl
+  cluster_domain: heat-cicd-queens-contrail41-sl.local
+  cluster_name: heat-cicd-queens-contrail41-sl
   opencontrail_version: 4.1
   linux_repo_contrail_component: oc41
   compute_bond_mode: active-backup
@@ -237,7 +237,7 @@
   tenant_network_subnet: ==IPV4_NET_TENANT_PREFIX==.0/24
   upstream_proxy_enabled: 'False'
   use_default_network_scheme: 'True'
-  openldap_domain: heat-cicd-pike-contrail41-sl.local
+  openldap_domain: heat-cicd-queens-contrail41-sl.local
   openldap_enabled: 'True'
   openldap_organisation: ${_param:cluster_name}
   ceph_enabled: 'True'
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-environment.yaml
similarity index 100%
rename from tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml
rename to tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt-context-environment.yaml
diff --git a/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt.yaml
new file mode 100644
index 0000000..720add3
--- /dev/null
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/salt.yaml
@@ -0,0 +1,14 @@
+{% set HOSTNAME_CFG01='cfg01.heat-cicd-queens-contrail41-sl.local' %}
+{% set LAB_CONFIG_NAME='heat-cicd-queens-contrail41-sl' %}
+{% set DOMAIN_NAME='heat-cicd-queens-contrail41-sl.local' %}
+
+# Other salt model repository parameters see in shared-salt.yaml
+
+{% import 'shared-salt.yaml' as SHARED with context %}
+
+{{ SHARED.MACRO_INSTALL_SALT_MINIONS() }}
+
+{{SHARED.MACRO_CHECK_SALT_VERSION_SERVICES_ON_CFG()}}
+
+{{SHARED.MACRO_CHECK_SALT_VERSION_ON_NODES()}}
+
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay--user-data-foundation.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay--user-data-foundation.yaml
similarity index 100%
rename from tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay--user-data-foundation.yaml
rename to tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay--user-data-foundation.yaml
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay-userdata.yaml b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
similarity index 100%
rename from tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay-userdata.yaml
rename to tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay-userdata.yaml
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
similarity index 99%
rename from tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
rename to tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
index e421244..3ffdb42 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/underlay.hot
+++ b/tcp_tests/templates/heat-cicd-queens-contrail41-sl/underlay.hot
@@ -2,12 +2,12 @@
 
 heat_template_version: queens
 
-description: MCP environment for heat-cicd-pike-contrail41-sl
+description: MCP environment for heat-cicd-queens-contrail41-sl
 
 parameters:
   instance_domain:
     type: string
-    default: heat-cicd-pike-contrail41-sl.local
+    default: heat-cicd-queens-contrail41-sl.local
   mcp_version:
     type: string
   env_name:
diff --git a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
index c5bfd8f..d427b8b 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-contrail41-sl/salt-context-cookiecutter-contrail.yaml
@@ -109,7 +109,17 @@
   kqueen_enabled: 'False'
   kubernetes_enabled: 'False'
   local_repositories: 'False'
-  maas_enabled: 'False'
+  maas_enabled: 'True'
+  maas_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.15
+  maas_deploy_cidr: ==IPV4_NET_ADMIN_PREFIX==.0/24
+  maas_deploy_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
+  maas_deploy_range_end: ==IPV4_NET_ADMIN_PREFIX==.250
+  maas_deploy_range_start: ==IPV4_NET_ADMIN_PREFIX==.240
+  maas_deploy_vlan: '0'
+  maas_dhcp_enabled: 'False'
+  maas_fabric_name: fabric-0
+  maas_hostname: cfg01
+  maas_manage_deploy_network: 'True'
   mcp_common_scripts_branch: ''
   mcp_version: proposed
   offline_deployment: 'False'
diff --git a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
index bab1394..6f91412 100644
--- a/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
+++ b/tcp_tests/templates/released-heat-cicd-pike-dvr-sl/salt-context-cookiecutter.yaml
@@ -365,3 +365,14 @@
   octavia_lb_mgmt_allocation_pool_end: 192.168.10.200
   cinder_backup_engine: 'ceph'
   cinder_ceph_backup_pool_name: 'backups'
+  maas_enabled: 'True'
+  maas_deploy_address: ==IPV4_NET_ADMIN_PREFIX==.15
+  maas_deploy_cidr: ==IPV4_NET_ADMIN_PREFIX==.0/24
+  maas_deploy_gateway: ==IPV4_NET_ADMIN_PREFIX==.1
+  maas_deploy_range_end: ==IPV4_NET_ADMIN_PREFIX==.250
+  maas_deploy_range_start: ==IPV4_NET_ADMIN_PREFIX==.240
+  maas_deploy_vlan: '0'
+  maas_dhcp_enabled: 'False'
+  maas_fabric_name: fabric-0
+  maas_hostname: cfg01
+  maas_manage_deploy_network: 'True'
diff --git a/tcp_tests/tests/system/test_cvp_pipelines.py b/tcp_tests/tests/system/test_cvp_pipelines.py
index a21d2c2..c73bb88 100644
--- a/tcp_tests/tests/system/test_cvp_pipelines.py
+++ b/tcp_tests/tests/system/test_cvp_pipelines.py
@@ -53,7 +53,11 @@
             tgt=tgt, pillar="jenkins:client:master:host")
         jenkins_port = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:port")
-        jenkins_url = 'http://{0}:{1}'.format(jenkins_host, jenkins_port)
+        jenkins_protocol = salt.get_single_pillar(
+            tgt=tgt, pillar="jenkins:client:master:proto")
+        jenkins_url = '{0}://{1}:{2}'.format(jenkins_protocol,
+                                             jenkins_host,
+                                             jenkins_port)
         jenkins_user = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:username")
         jenkins_pass = salt.get_single_pillar(
@@ -113,7 +117,11 @@
             tgt=tgt, pillar="jenkins:client:master:host")
         jenkins_port = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:port")
-        jenkins_url = 'http://{0}:{1}'.format(jenkins_host, jenkins_port)
+        jenkins_protocol = salt.get_single_pillar(
+            tgt=tgt, pillar="jenkins:client:master:proto")
+        jenkins_url = '{0}://{1}:{2}'.format(jenkins_protocol,
+                                             jenkins_host,
+                                             jenkins_port)
         jenkins_user = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:username")
         jenkins_pass = salt.get_single_pillar(
@@ -209,7 +217,11 @@
             tgt=tgt, pillar="jenkins:client:master:host")
         jenkins_port = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:port")
-        jenkins_url = 'http://{0}:{1}'.format(jenkins_host, jenkins_port)
+        jenkins_protocol = salt.get_single_pillar(
+            tgt=tgt, pillar="jenkins:client:master:proto")
+        jenkins_url = '{0}://{1}:{2}'.format(jenkins_protocol,
+                                             jenkins_host,
+                                             jenkins_port)
         jenkins_user = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:username")
         jenkins_pass = salt.get_single_pillar(
@@ -273,7 +285,11 @@
             tgt=tgt, pillar="jenkins:client:master:host")
         jenkins_port = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:port")
-        jenkins_url = 'http://{0}:{1}'.format(jenkins_host, jenkins_port)
+        jenkins_protocol = salt.get_single_pillar(
+            tgt=tgt, pillar="jenkins:client:master:proto")
+        jenkins_url = '{0}://{1}:{2}'.format(jenkins_protocol,
+                                             jenkins_host,
+                                             jenkins_port)
         jenkins_user = salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:username")
         jenkins_pass = salt.get_single_pillar(