diff --git a/docker/swarm/stack/monitoring/init.yml b/docker/swarm/stack/monitoring/init.yml
index 97b9ac3..347319a 100644
--- a/docker/swarm/stack/monitoring/init.yml
+++ b/docker/swarm/stack/monitoring/init.yml
@@ -32,6 +32,7 @@
               environment:
                 bind_port: ${prometheus:remote_storage_adapter:bind:port}
                 bind_address: ${prometheus:remote_storage_adapter:bind:address}
+                influxdb_retention_policy: 'lma'
                 influxdb_url: ${_param:prometheus_influxdb_url}
                 influxdb_db: ${_param:prometheus_influxdb_db}
                 influxdb_username: ${_param:prometheus_influxdb_username}
diff --git a/haproxy/proxy/listen/cicd/aptly.yml b/haproxy/proxy/listen/cicd/aptly.yml
index fb24c1f..35ae3d6 100644
--- a/haproxy/proxy/listen/cicd/aptly.yml
+++ b/haproxy/proxy/listen/cicd/aptly.yml
@@ -14,6 +14,9 @@
             - httpclose
             - httplog
           balance: source
+          timeout:
+            server: 10m
+            client: 10m
           binds:
             - address: ${_param:haproxy_aptly_api_bind_host}
               port: ${_param:haproxy_aptly_api_bind_port}
diff --git a/influxdb/client/database/ceilometer.yml b/influxdb/client/database/ceilometer.yml
index 52aebae..88d6a07 100644
--- a/influxdb/client/database/ceilometer.yml
+++ b/influxdb/client/database/ceilometer.yml
@@ -8,7 +8,7 @@
           enabled: true
           name: ceilometer
           retention_policy:
-            - name: ceilometer_default
+            - name: ceilometer
               is_default: true
               duration: ${_param:influxdb_ceilometer_rp_duration}
               replication: 1
diff --git a/influxdb/client/database/prometheus.yml b/influxdb/client/database/prometheus.yml
new file mode 100644
index 0000000..991fbd2
--- /dev/null
+++ b/influxdb/client/database/prometheus.yml
@@ -0,0 +1,25 @@
+parameters:
+  _param:
+    influxdb_prometheus_rp_duration: 30d
+  influxdb:
+    client:
+      database:
+        prometheus:
+          enabled: true
+          name: prometheus
+          retention_policy:
+          - name: lma
+            is_default: true
+            duration: ${_param:influxdb_prometheus_rp_duration}
+            replication: 1
+      user:
+        lma:
+          enabled: true
+          name: lma
+          password: ${_param:influxdb_stacklight_password}
+      grant:
+        lma_all_on_prometheus:
+          enabled: true
+          user: lma
+          database: prometheus
+          privilege: all
diff --git a/influxdb/client/database/stacklight.yml b/influxdb/client/database/stacklight.yml
index d07d0b8..76b8e60 100644
--- a/influxdb/client/database/stacklight.yml
+++ b/influxdb/client/database/stacklight.yml
@@ -8,9 +8,9 @@
           enabled: true
           name: lma
           retention_policy:
-          - name: lma_default
+          - name: lma
             is_default: true
-            duration: ${_param:influxdb_stacklight_password}
+            duration: ${_param:influxdb_stacklight_rp_duration}
             replication: 1
       user:
         lma:
@@ -18,7 +18,7 @@
           name: lma
           password: ${_param:influxdb_stacklight_password}
       grant:
-        lma_all:
+        lma_all_on_lma:
           enabled: true
           user: lma
           database: lma
diff --git a/influxdb/database/prometheus.yml b/influxdb/database/prometheus.yml
new file mode 100644
index 0000000..3e3d63b
--- /dev/null
+++ b/influxdb/database/prometheus.yml
@@ -0,0 +1,25 @@
+parameters:
+  _param:
+    influxdb_prometheus_database_retention: 30d
+  influxdb:
+    server:
+      database:
+        prometheus:
+          enabled: true
+          name: prometheus
+          retention_policy:
+          - name: lma
+            is_default: true
+            duration: ${_param:influxdb_prometheus_database_retention}
+            replication: 1
+      user:
+        lma:
+          enabled: true
+          name: lma
+          password: ${_param:influxdb_stacklight_password}
+      grant:
+        grant_lma_all_on_prometheus:
+          enabled: true
+          user: lma
+          database: prometheus
+          privilege: all
diff --git a/influxdb/database/stacklight.yml b/influxdb/database/stacklight.yml
index d741380..9eb2eb0 100644
--- a/influxdb/database/stacklight.yml
+++ b/influxdb/database/stacklight.yml
@@ -1,4 +1,6 @@
 parameters:
+  _param:
+    influxdb_lma_database_retention: 30d
   influxdb:
     server:
       database:
@@ -8,7 +10,7 @@
           retention_policy:
           - name: lma
             is_default: true
-            duration: 30d
+            duration: ${_param:influxdb_lma_database_retention}
             replication: 1
       user:
         lma:
@@ -16,7 +18,7 @@
           name: lma
           password: ${_param:influxdb_stacklight_password}
       grant:
-        grant_lma_all:
+        grant_lma_all_on_lma:
           enabled: true
           user: lma
           database: lma
diff --git a/jenkins/client/job/deploy/lab/component/aaa.yml b/jenkins/client/job/deploy/lab/component/aaa.yml
index 61d0b60..1c640d5 100644
--- a/jenkins/client/job/deploy/lab/component/aaa.yml
+++ b/jenkins/client/job/deploy/lab/component/aaa.yml
@@ -4,6 +4,7 @@
   _param:
     jenkins_deploy_jobs:
       - stack_name: aaa_ha_freeipa
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,aaa
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/component/ceph.yml b/jenkins/client/job/deploy/lab/component/ceph.yml
index 0d84374..b0b3af1 100644
--- a/jenkins/client/job/deploy/lab/component/ceph.yml
+++ b/jenkins/client/job/deploy/lab/component/ceph.yml
@@ -4,6 +4,7 @@
   _param:
     jenkins_deploy_jobs:
       - stack_name: ceph_ha
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,ceph
         stack_test: "ceph"
diff --git a/jenkins/client/job/deploy/lab/component/drivetrain.yml b/jenkins/client/job/deploy/lab/component/drivetrain.yml
index e9e00e7..945ac4a 100644
--- a/jenkins/client/job/deploy/lab/component/drivetrain.yml
+++ b/jenkins/client/job/deploy/lab/component/drivetrain.yml
@@ -4,11 +4,13 @@
   _param:
     jenkins_deploy_jobs:
       - stack_name: drivetrain_ha
+        stack_env: devcloud
         stack_type: heat
         stack_install: core
         stack_test: ""
         job_timer: ""
       - stack_name: drivetrain_ha_clusters
+        stack_env: devcloud
         stack_type: heat
         stack_install: core
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/component/kubernetes.yml b/jenkins/client/job/deploy/lab/component/kubernetes.yml
index 9e80c64..5ef3bd9 100644
--- a/jenkins/client/job/deploy/lab/component/kubernetes.yml
+++ b/jenkins/client/job/deploy/lab/component/kubernetes.yml
@@ -4,26 +4,31 @@
   _param:
     jenkins_deploy_jobs:
       - stack_name: k8s_aio_calico
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,k8s,calico
         stack_test: ""
         job_timer: ""
       - stack_name: k8s_aio_contrail
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,k8s,contrail
         stack_test: ""
         job_timer: ""
       - stack_name: k8s_ha_calico
+        stack_env: devcloud
         stack_type: aws
         stack_install: core,k8s,calico
         stack_test: ""
         job_timer: "H H(0-6) * * *"
       - stack_name: k8s_ha_calico
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,k8s,calico
         stack_test: ""
         job_timer: "H H(0-6) * * *"
       - stack_name: k8s_ha_contrail
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,k8s,contrail
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/component/openstack.yml b/jenkins/client/job/deploy/lab/component/openstack.yml
index 33c03f3..1e1d334 100644
--- a/jenkins/client/job/deploy/lab/component/openstack.yml
+++ b/jenkins/client/job/deploy/lab/component/openstack.yml
@@ -4,20 +4,24 @@
   _param:
     jenkins_deploy_jobs:
       - stack_name: os_aio_contrail
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,openstack,contrail
         stack_test: ""
         job_timer: ""
       - stack_name: os_aio_ovs
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,openstack,ovs
         job_timer: ""
       - stack_name: os_ha_contrail
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,openstack,contrail
         stack_test: ""
         job_timer: "H H(0-6) * * *"
       - stack_name: os_ha_ovs
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,openstack,ovs
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/component/stacklight.yml b/jenkins/client/job/deploy/lab/component/stacklight.yml
index 2802e13..94ccce2 100644
--- a/jenkins/client/job/deploy/lab/component/stacklight.yml
+++ b/jenkins/client/job/deploy/lab/component/stacklight.yml
@@ -4,16 +4,19 @@
   _param:
     jenkins_deploy_jobs:
       - stack_name: stacklight_k8s_calico
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,k8s,calico,stacklight
         stack_test: ""
         job_timer: "H H(0-6) * * *"
       - stack_name: stacklight_os_contrail
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,openstack,contrail,stacklight
         stack_test: ""
         job_timer: "H H(0-6) * * *"
       - stack_name: stacklight_os_ovs
+        stack_env: devcloud
         stack_type: heat
         stack_install: core,openstack,ovs,stacklight
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/deploy.yml b/jenkins/client/job/deploy/lab/deploy.yml
index 5d87340..75bab43 100644
--- a/jenkins/client/job/deploy/lab/deploy.yml
+++ b/jenkins/client/job/deploy/lab/deploy.yml
@@ -94,7 +94,7 @@
               # heat
               HEAT_STACK_ENVIRONMENT:
                 type: string
-                default: "devcloud"
+                default: "{{stack_env}}"
               HEAT_STACK_ZONE:
                 type: string
                 default: "mcp-mk"
diff --git a/jenkins/client/job/deploy/lab/init.yml b/jenkins/client/job/deploy/lab/init.yml
index 881e425..860e55f 100644
--- a/jenkins/client/job/deploy/lab/init.yml
+++ b/jenkins/client/job/deploy/lab/init.yml
@@ -1,6 +1,6 @@
 classes:
   - system.jenkins.client.job.deploy.lab.cicd
-  - system.jenkins.client.job.deploy.lab.test-cicd
+  - system.jenkins.client.job.deploy.lab.test-devops-portal-cicd
   - system.jenkins.client.job.deploy.lab.demo
   - system.jenkins.client.job.deploy.lab.cleanup
   - system.jenkins.client.job.deploy.lab.release.mcp05
diff --git a/jenkins/client/job/deploy/lab/release/mcp05.yml b/jenkins/client/job/deploy/lab/release/mcp05.yml
index 3dbc25f..5ec2787 100644
--- a/jenkins/client/job/deploy/lab/release/mcp05.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp05.yml
@@ -4,11 +4,13 @@
   _param:
     jenkins_deploy_jobs:
       - stack_name: virtual_mcp05_dvr
+        stack_env: virtual_mcp05_dvr/devcloud
         stack_install: core,openstack,dvr
         stack_type: heat
         stack_test: ""
         job_timer: ""
       - stack_name: virtual_mcp05_ovs
+        stack_env: virtual_mcp05_ovs/devcloud
         stack_install: core,openstack,ovs
         stack_type: heat
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp10.yml b/jenkins/client/job/deploy/lab/release/mcp10.yml
index e8905ac..516d533 100644
--- a/jenkins/client/job/deploy/lab/release/mcp10.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp10.yml
@@ -5,21 +5,25 @@
     jenkins_deploy_jobs:
       # physical
       - stack_name: mcp10_contrail
+        stack_env: mcp10_contrail/devcloud
         stack_install: core,kvm,openstack,contrail
         stack_type: physical
         stack_test: openstack
         job_timer: ""
       - stack_name: mcp10_opencontrail_nfv
+        stack_env: mcp10_opencontrail_nfv/devcloud
         stack_install: core,kvm,openstack,nfv
         stack_type: physical
         stack_test: openstack
         job_timer: ""
       - stack_name: mcp10_dvr
+        stack_env: mcp10_dvr/devcloud
         stack_install: core,kvm,openstack,dvr
         stack_type: physical
         stack_test: openstack
         job_timer: ""
       - stack_name: mcp10_non_dvr
+        stack_env: mcp10_non_dvr/devcloud
         stack_install: core,kvm,openstack
         stack_type: physical
         stack_test: openstack
@@ -27,16 +31,19 @@
 
       # virtual
       - stack_name: virtual_mcp10_contrail
+        stack_env: virtual_mcp10_contrail/devcloud
         stack_install: core,openstack,contrail
         stack_type: heat
         stack_test: ""
         job_timer: "H H(0-6) * * *"
       - stack_name: virtual_mcp10_dvr
+        stack_env: virtual_mcp10_dvr/devcloud
         stack_install: core,openstack,dvr
         stack_type: heat
         stack_test: ""
         job_timer: "H H(0-6) * * *"
       - stack_name: virtual_mcp10_ovs
+        stack_env: virtual_mcp10_ovs/devcloud
         stack_install: core,openstack,ovs
         stack_type: heat
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mcp11.yml b/jenkins/client/job/deploy/lab/release/mcp11.yml
index 98c8a5c..27f2184 100644
--- a/jenkins/client/job/deploy/lab/release/mcp11.yml
+++ b/jenkins/client/job/deploy/lab/release/mcp11.yml
@@ -4,46 +4,55 @@
   _param:
     jenkins_deploy_jobs:
       - stack_name: virtual_mcp11_contrail
+        stack_env: virtual_mcp11_contrail/devcloud
         stack_install: core,openstack,contrail
         stack_type: heat
         stack_test: ""
         job_timer: ""
       - stack_name: virtual_mcp11_dvr
+        stack_env: virtual_mcp11_dvr/devcloud
         stack_install: core,openstack,dvr
         stack_type: heat
         stack_test: ""
         job_timer: ""
       - stack_name: virtual_mcp11_ovs
+        stack_env: virtual_mcp11_ovs/devcloud
         stack_install: core,openstack,ovs
         stack_type: heat
         stack_test: ""
         job_timer: ""
       - stack_name: virtual_mcp11_ironic_small
+        stack_env: virtual_mcp11_ironic_small/devcloud
         stack_install: core,openstack
         stack_type: heat
         stack_test: ""
         job_timer: ""
       - stack_name: virtual_mcp11_aio
+        stack_env: virtual_mcp11_aio/devcloud
         stack_install: core,openstack
         stack_type: heat
         stack_test: ""
         job_timer: ""
       - stack_name: virtual_mcp11_k8s_calico
+        stack_env: virtual_mcp11_k8s_calico/devcloud
         stack_install: core,k8s,calico
         stack_type: heat
         stack_test: k8s
         job_timer: "H H(0-6) * * *"
       - stack_name: virtual_mcp11_k8s_contrail
+        stack_env: virtual_mcp11_k8s_contrail/devcloud
         stack_install: core,k8s,contrail
         stack_type: heat
         stack_test: k8s
         job_timer: "H H(0-6) * * *"
       - stack_name: virtual_mcp11_contrail_nfv
+        stack_env: virtual_mcp11_contrail_nfv/devcloud
         stack_install: core,openstack,contrail
         stack_type: heat
         stack_test: ""
         job_timer: "H H(0-6) * * *"
       - stack_name: virtual_mcp11_ovs_dpdk
+        stack_env: virtual_mcp11_ovs_dpdk/devcloud
         stack_install: core,openstack,ovs
         stack_type: heat
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/release/mk.yml b/jenkins/client/job/deploy/lab/release/mk.yml
index 4fce1c5..1be1057 100644
--- a/jenkins/client/job/deploy/lab/release/mk.yml
+++ b/jenkins/client/job/deploy/lab/release/mk.yml
@@ -5,22 +5,26 @@
     jenkins_deploy_jobs:
       # mk20
       - stack_name: virtual_mk20_advanced
+        stack_env: virtual_mk20_advanced/devcloud
         stack_install: core,openstack
         stack_type: heat
         stack_test: ""
         job_timer: ""
       - stack_name: virtual_mk20_basic
+        stack_env: virtual_mk20_basic/devcloud
         stack_install: core,openstack
         stack_type: heat
         stack_test: ""
         job_timer: ""
       # mk22
       - stack_name: virtual_mk22_advanced
+        stack_env: virtual_mk22_advanced/devcloud
         stack_install: core,openstack
         stack_type: heat
         stack_test: ""
         job_timer: ""
       - stack_name: virtual_mk22_basic
+        stack_env: virtual_mk22_basic/devcloud
         stack_install: core,openstack
         stack_type: heat
         stack_test: ""
diff --git a/jenkins/client/job/deploy/lab/test-cicd.yml b/jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml
similarity index 96%
rename from jenkins/client/job/deploy/lab/test-cicd.yml
rename to jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml
index 0205223..ab84659 100644
--- a/jenkins/client/job/deploy/lab/test-cicd.yml
+++ b/jenkins/client/job/deploy/lab/test-devops-portal-cicd.yml
@@ -13,9 +13,9 @@
             display_name: "Deploy {{name}} heat stack"
             scm:
               type: git
-              url: "${_param:jenkins_gerrit_url}/mk/mk-pipelines"
+              url: "${_param:jenkins_gerrit_url}/oss/jenkins/pipelines"
               credentials: "gerrit"
-              script: cicd-lab-pipeline.groovy
+              script: test-func-devops-portal-pipeline.groovy
             param:
               # heat
               HEAT_TEMPLATE_URL:
diff --git a/jenkins/client/job/docker/oss/janitor-monkey-docker.yml b/jenkins/client/job/docker/oss/janitor-monkey-docker.yml
index 083d086..78167bd 100644
--- a/jenkins/client/job/docker/oss/janitor-monkey-docker.yml
+++ b/jenkins/client/job/docker/oss/janitor-monkey-docker.yml
@@ -58,10 +58,4 @@
               default: "Dockerfile"
             CONTEXT_PATH:
               type: string
-              default: "."
-            CI_BUILD_ARG_JANITOR_MONKEY_REPO:
-              type: string
-              default: ""
-            CI_BUILD_ARG_JANITOR_MONKEY_REF:
-              type: string
-              default: ""
\ No newline at end of file
+              default: "."
\ No newline at end of file
diff --git a/jenkins/client/job/docker/oss/pushkin-docker.yml b/jenkins/client/job/docker/oss/pushkin-docker.yml
index d71e701..e77e99b 100644
--- a/jenkins/client/job/docker/oss/pushkin-docker.yml
+++ b/jenkins/client/job/docker/oss/pushkin-docker.yml
@@ -58,16 +58,4 @@
               default: "Dockerfile"
             CONTEXT_PATH:
               type: string
-              default: "."
-            CI_BUILD_ARG_PUSHKIN_REPO:
-              type: string
-              default: ""
-            CI_BUILD_ARG_PUSHKIN_REF:
-              type: string
-              default: ""
-            CI_BUILD_ARG_PUSHKIN_EXT_REPO:
-              type: string
-              default: ""
-            CI_BUILD_ARG_PUSHKIN_EXT_REF:
-              type: string
-              default: ""
\ No newline at end of file
+              default: "."
\ No newline at end of file
diff --git a/jenkins/client/job/docker/oss/security-monkey-docker.yml b/jenkins/client/job/docker/oss/security-monkey-docker.yml
index 7724f80..b9d4512 100644
--- a/jenkins/client/job/docker/oss/security-monkey-docker.yml
+++ b/jenkins/client/job/docker/oss/security-monkey-docker.yml
@@ -58,16 +58,4 @@
               default: "security-monkey/Dockerfile"
             CONTEXT_PATH:
               type: string
-              default: "."
-            CI_BUILD_ARG_SECURITY_MONKEY_REPO:
-              type: string
-              default: ""
-            CI_BUILD_ARG_SECURITY_MONKEY_REF:
-              type: string
-              default: ""
-            CI_BUILD_ARG_SECURITY_MONKEY_OPENSTACK_REPO:
-              type: string
-              default: ""
-            CI_BUILD_ARG_SECURITY_MONKEY_OPENSTACK_REF:
-              type: string
-              default: ""
\ No newline at end of file
+              default: "."
\ No newline at end of file
diff --git a/linux/system/repo/mcp/contrail.yml b/linux/system/repo/mcp/contrail.yml
index 0d9d68e..8dad590 100644
--- a/linux/system/repo/mcp/contrail.yml
+++ b/linux/system/repo/mcp/contrail.yml
@@ -7,7 +7,7 @@
     system:
       repo:
         mcp_opencontrail:
-          source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_contrail_version} ${_param:openstack_version} ${_param:linux_repo_contrail_component} extra"
+          source: "deb [arch=amd64] http://apt-mk.mirantis.com/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_contrail_version} ${_param:linux_repo_contrail_component} extra"
           architectures: amd64
           key_url: "http://apt-mk.mirantis.com/public.gpg"
           pin:
diff --git a/nova/client/service/octavia.yml b/nova/client/service/octavia.yml
index e0b6557..e31fde3 100644
--- a/nova/client/service/octavia.yml
+++ b/nova/client/service/octavia.yml
@@ -1,8 +1,6 @@
 classes:
 - service.nova.client
 parameters:
-  _param:
-    octavia_ssh_key_path: "/etc/octavia/.ssh/octavia_ssh_key.pub"
   nova:
     client:
       server:
@@ -18,4 +16,4 @@
           endpoint_type: internalURL
           keypair:
             octavia_ssh_key:
-              pub_file: ${_param:octavia_ssh_key_path}
+              pub_key: ${_param:octavia_public_key}
diff --git a/octavia/manager/single.yml b/octavia/manager/single.yml
index a7bc7a9..acab136 100644
--- a/octavia/manager/single.yml
+++ b/octavia/manager/single.yml
@@ -5,3 +5,7 @@
     manager:
       enabled: true
       version: ${_param:octavia_version}
+      ssh:
+        private_key: ${_param:octavia_private_key}
+        user: octavia
+        group: octavia
diff --git a/openssh/server/team/mmo_devops.yml b/openssh/server/team/mmo_devops.yml
index fae9be2..1fe82c6 100644
--- a/openssh/server/team/mmo_devops.yml
+++ b/openssh/server/team/mmo_devops.yml
@@ -1,11 +1,9 @@
 classes:
 # DevOps/SRE Team
 - system.openssh.server.team.members.cade
-- system.openssh.server.team.members.dszeluga
 - system.openssh.server.team.members.jmosher
 - system.openssh.server.team.members.ecantwell
 - system.openssh.server.team.members.lmercl
-- system.openssh.server.team.members.mrelewicz
 - system.openssh.server.team.members.mwilson
 - system.openssh.server.team.members.osmola
 - system.openssh.server.team.members.pcizinsky
diff --git a/openssh/server/team/support.yml b/openssh/server/team/support.yml
index 7c0c810..30382a3 100644
--- a/openssh/server/team/support.yml
+++ b/openssh/server/team/support.yml
@@ -39,7 +39,6 @@
 - system.openssh.server.team.members.jmosher
 - system.openssh.server.team.members.ecantwell
 - system.openssh.server.team.members.lmercl
-- system.openssh.server.team.members.mrelewicz
 - system.openssh.server.team.members.osmola
 - system.openssh.server.team.members.pcizinsky
 - system.openssh.server.team.members.pmathews
@@ -62,66 +61,64 @@
           name: support1
           addusers:
             # L1
-            - ${linux:system:users:ardobdin:name}
-            - ${linux:system:users:arubtsov:name}
-            - ${linux:system:users:aneliubin:name}
-            - ${linux:system:users:arodionov:name}
-            - ${linux:system:users:cmay:name}
-            - ${linux:system:users:dakhmetov:name}
-            - ${linux:system:users:dkostriukov:name}
-            - ${linux:system:users:dgoloshubov:name}
-            - ${linux:system:users:jdiaz:name}
-            - ${linux:system:users:jpalmerin:name}
-            - ${linux:system:users:kfranckowski:name}
-            - ${linux:system:users:mroark:name}
-            - ${linux:system:users:mefimov:name}
-            - ${linux:system:users:mkraynov:name}
-            - ${linux:system:users:nkabanova:name}
-            - ${linux:system:users:rsoto:name}
-            - ${linux:system:users:rsafonov:name}
-            - ${linux:system:users:smachtmes:name}
-            - ${linux:system:users:zkhurasani:name}
+            - ${linux:system:user:adobdin:name}
+            - ${linux:system:user:arubtsov:name}
+            - ${linux:system:user:aneliubin:name}
+            - ${linux:system:user:arodionov:name}
+            - ${linux:system:user:cmay:name}
+            - ${linux:system:user:dakhmetov:name}
+            - ${linux:system:user:dkostriukov:name}
+            - ${linux:system:user:dgoloshubov:name}
+            - ${linux:system:user:jdiaz:name}
+            - ${linux:system:user:jpalmerin:name}
+            - ${linux:system:user:kfranckowski:name}
+            - ${linux:system:user:mroark:name}
+            - ${linux:system:user:mefimov:name}
+            - ${linux:system:user:mkraynov:name}
+            - ${linux:system:user:nkabanova:name}
+            - ${linux:system:user:rsoto:name}
+            - ${linux:system:user:rsafonov:name}
+            - ${linux:system:user:smachtmes:name}
+            - ${linux:system:user:zkhurasani:name}
         support2:
           enabled: true
           name: support2
           addusers:
             # L2OPS
-            - ${linux:system:users:aepifanov:name}
-            - ${linux:system:users:apetrenko:name}
-            - ${linux:system:users:atarasov:name}
-            - ${linux:system:users:dklepikov:name}
-            - ${linux:system:users:dsutyagin:name}
-            - ${linux:system:users:ekozhemyaki:name}
-            - ${linux:system:users:enikanorov:name}
-            - ${linux:system:users:fsoppelsa:name}
-            - ${linux:system:users:manashkin:name}
-            - ${linux:system:users:nkondra:name}
-            - ${linux:system:users:obryndzii:name}
-            - ${linux:system:users:oliemieshko:name}
-            - ${linux:system:users:sovsianikov:name}
+            - ${linux:system:user:aepifanov:name}
+            - ${linux:system:user:apetrenko:name}
+            - ${linux:system:user:atarasov:name}
+            - ${linux:system:user:dklepikov:name}
+            - ${linux:system:user:dsutyagin:name}
+            - ${linux:system:user:ekozhemyakin:name}
+            - ${linux:system:user:enikanorov:name}
+            - ${linux:system:user:fsoppelsa:name}
+            - ${linux:system:user:manashkin:name}
+            - ${linux:system:user:nkondra:name}
+            - ${linux:system:user:obryndzii:name}
+            - ${linux:system:user:oliemieshko:name}
+            - ${linux:system:user:sovsianikov:name}
             # L2OPS SRE
-            - ${linux:system:users:pmichalec:name}
-            - ${linux:system:users:pmathews:name}
-            - ${linux:system:users:pcizinsky:name}
-            - ${linux:system:users:osmola:name}
-            - ${linux:system:users:cade:name}
-            - ${linux:system:users:jmosher:name}
-            - ${linux:system:users:ecantwell:name}
-            - ${linux:system:users:lmercl:name}
-            - ${linux:system:users:mrelewicz:name}
+            - ${linux:system:user:pmichalec:name}
+            - ${linux:system:user:pmathews:name}
+            - ${linux:system:user:pcizinsky:name}
+            - ${linux:system:user:osmola:name}
+            - ${linux:system:user:cade:name}
+            - ${linux:system:user:jmosher:name}
+            - ${linux:system:user:ecantwell:name}
+            - ${linux:system:user:lmercl:name}
         support3:
           enabled: false
           name: support3
           addusers:
-            - ${linux:system:users:pmichalec:name}
-            - ${linux:system:users:pmathews:name}
-            - ${linux:system:users:pcizinsky:name}
-            - ${linux:system:users:osmola:name}
-            - ${linux:system:users:cade:name}
-            - ${linux:system:users:jmosher:name}
-            - ${linux:system:users:ecantwell:name}
-            - ${linux:system:users:lmercl:name}
-            - ${linux:system:users:mrelewicz:name}
+            - ${linux:system:user:pmichalec:name}
+            - ${linux:system:user:pmathews:name}
+            - ${linux:system:user:pcizinsky:name}
+            - ${linux:system:user:osmola:name}
+            - ${linux:system:user:cade:name}
+            - ${linux:system:user:jmosher:name}
+            - ${linux:system:user:ecantwell:name}
+            - ${linux:system:user:lmercl:name}
       sudo:
         enabled: true
         aliases:
diff --git a/salt/minion/ca/octavia_ca.yml b/salt/minion/ca/octavia_ca.yml
index ac66bec..453c450 100644
--- a/salt/minion/ca/octavia_ca.yml
+++ b/salt/minion/ca/octavia_ca.yml
@@ -27,3 +27,7 @@
           days_valid:
             authority: ${_param:octavia_ca_days_valid_authority}
             certificate: ${_param:octavia_ca_days_valid_certificate}
+          ca_file: ${octavia:manager:certificates:ca_certificate}
+          ca_key_file: ${octavia:manager:certificates:ca_private_key}
+          user: octavia
+          group: octavia
diff --git a/salt/minion/cert/octavia/amphora_client.yml b/salt/minion/cert/octavia/amphora_client.yml
new file mode 100644
index 0000000..fd8f465
--- /dev/null
+++ b/salt/minion/cert/octavia/amphora_client.yml
@@ -0,0 +1,12 @@
+classes:
+- system.salt.minion.cert.octavia
+parameters:
+  salt:
+    minion:
+      cert:
+        octavia_amp_client:
+          ca_file: ${octavia:manager:certificates:ca_certificate}
+          ca_key_file: ${octavia:manager:certificates:ca_private_key}
+          key_file: ${octavia:manager:haproxy_amphora:client_cert_key}
+          cert_file: ${octavia:manager:haproxy_amphora:client_cert}
+          all_file: ${octavia:manager:haproxy_amphora:client_cert_all}
diff --git a/salt/minion/cert/octavia_amp_client.yml b/salt/minion/cert/octavia/init.yml
similarity index 60%
rename from salt/minion/cert/octavia_amp_client.yml
rename to salt/minion/cert/octavia/init.yml
index 5219450..25d3ee4 100644
--- a/salt/minion/cert/octavia_amp_client.yml
+++ b/salt/minion/cert/octavia/init.yml
@@ -12,10 +12,5 @@
           common_name: octavia_amp_client
           signing_policy: cert_open
           key_usage: "digitalSignature,nonRepudiation,keyEncipherment"
-          ca_file: ${octavia:manager:certificates:ca_certificate}
-          ca_key_file: ${octavia:manager:certificates:ca_private_key}
-          key_file: ${octavia:manager:haproxy_amphora:client_cert_key}
-          cert_file: ${octavia:manager:haproxy_amphora:client_cert}
-          all_file: ${octavia:manager:haproxy_amphora:client_cert_all}
           user: octavia
           group: octavia
diff --git a/salt/minion/cert/prometheus_server.yml b/salt/minion/cert/prometheus_server.yml
index 30a0711..154009b 100644
--- a/salt/minion/cert/prometheus_server.yml
+++ b/salt/minion/cert/prometheus_server.yml
@@ -9,5 +9,4 @@
           cert_file: ${prometheus:server:dir:config}/prometheus-server.crt
           common_name: prometheus-server
           signing_policy: cert_client
-          alternative_names: IP:${_param:cluster_vip_address},IP:${_param:cluster_node01_address},IP:${_param:cluster_node02_address},IP:${_param:cluster_node03_address},IP:${_param:kubernetes_internal_api_address}
           mode: '0444'