diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
index c131590..1f0e0bc 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
@@ -143,6 +143,8 @@
           cluster_param:
             openstack_gateway_address:
               value_template: <<node_control_ip>>
+            openstack_gateway_node01_external_address:
+              value_template: <<node_external_ip>>
         openstack_dashboard:
           expression: <<node_hostname>>__startswith__prx
           node_class:
@@ -212,7 +214,7 @@
         openstack_gateway_node01:
           params:
             tenant_address: 10.1.0.110
-            external_address: 10.16.0.110
+            external_address: ${_param:openstack_gateway_node01_external_address}
         openstack_share_node01:
           params:
             single_address: 172.16.10.130
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
index 02044b0..8c13d59 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/init.yml
@@ -22,6 +22,7 @@
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
     openstack_gateway_address: 172.16.10.110
     openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+    openstack_gateway_node01_external_address: 10.16.0.110
     openstack_dns_node01_address: 172.16.10.111
     openstack_dns_node02_address: 172.16.10.112
     openstack_share_node01_address: 172.16.10.130
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index 4868c19..3cb9888 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -134,6 +134,8 @@
           cluster_param:
             openstack_gateway_address:
               value_template: <<node_control_ip>>
+            openstack_gateway_node01_external_address:
+              value_template: <<node_external_ip>>
         openstack_dashboard:
           expression: <<node_hostname>>__startswith__prx
           node_class:
@@ -200,7 +202,7 @@
         openstack_gateway_node01:
           params:
             tenant_address: 10.1.0.110
-            external_address: 10.16.0.110
+            external_address: ${_param:openstack_gateway_node01_external_address}
         openstack_share_node01:
           params:
             single_address: 172.16.10.130
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
index 0e595dc..100da01 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/init.yml
@@ -22,6 +22,7 @@
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
     openstack_gateway_address: 172.16.10.110
     openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+    openstack_gateway_node01_external_address: 10.16.0.110
     openstack_dns_node01_address: 172.16.10.111
     openstack_dns_node02_address: 172.16.10.112
     openstack_share_node01_address: 172.16.10.130
diff --git a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
index d340e7b..aff272f 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/infra/config.yml
@@ -150,6 +150,8 @@
           cluster_param:
             openstack_gateway_address:
               value_template: <<node_control_ip>>
+            openstack_gateway_node01_external_address:
+              value_template: <<node_external_ip>>
         openstack_dashboard:
           expression: <<node_hostname>>__startswith__prx
           node_class:
@@ -218,7 +220,7 @@
         openstack_gateway_node01:
           params:
             tenant_address: 10.1.0.110
-            external_address: 10.16.0.110
+            external_address: ${_param:openstack_gateway_node01_external_address}
         openstack_share_node01:
           params:
             single_address: 172.16.10.130
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
index 934bf8f..a2b7bb5 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/init.yml
@@ -22,6 +22,7 @@
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
     openstack_gateway_address: 172.16.10.110
     openstack_gateway_node01_address: ${_param:openstack_gateway_address}
+    openstack_gateway_node01_external_address: 10.16.0.110
     openstack_dns_node01_address: 172.16.10.111
     openstack_dns_node02_address: 172.16.10.112
     openstack_share_node01_address: 172.16.10.130
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
index ebf843d..45efcbd 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/init.yml
@@ -15,6 +15,7 @@
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
+- system.auditd.server.ciscat
 - cluster.virtual-offline-pike-ovs-dpdk.infra
 - cluster.virtual-offline-pike-ovs-dpdk.openstack
 - cluster.virtual-offline-pike-ovs-dpdk.stacklight
diff --git a/classes/cluster/virtual-offline-pike-ovs/init.yml b/classes/cluster/virtual-offline-pike-ovs/init.yml
index 7b41e0b..8c5b321 100644
--- a/classes/cluster/virtual-offline-pike-ovs/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/init.yml
@@ -15,6 +15,7 @@
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
+- system.auditd.server.ciscat
 - cluster.virtual-offline-pike-ovs.infra
 - cluster.virtual-offline-pike-ovs.openstack
 - cluster.virtual-offline-pike-ovs.stacklight
diff --git a/classes/cluster/virtual-offline-ssl/.env b/classes/cluster/virtual-offline-ssl/.env
index b054cf5..cf4c91c 100644
--- a/classes/cluster/virtual-offline-ssl/.env
+++ b/classes/cluster/virtual-offline-ssl/.env
@@ -1 +1 @@
-FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican logrotate)
+FORMULAS_SALT_MASTER+=(java openssh ntp nginx collectd sensu heka sphinx mysql galera grafana libvirt rsyslog glusterfs postfix xtrabackup freeipa prometheus telegraf elasticsearch kibana rundeck devops-portal libvirt rsyslog memcached rabbitmq apache keystone glance nova neutron cinder heat horizon ironic tftpd-hpa bind powerdns designate barbican iptables fluentd dogtag barbican logrotate auditd)
diff --git a/classes/cluster/virtual-offline-ssl/infra/config.yml b/classes/cluster/virtual-offline-ssl/infra/config.yml
index 931d137..da13d9f 100644
--- a/classes/cluster/virtual-offline-ssl/infra/config.yml
+++ b/classes/cluster/virtual-offline-ssl/infra/config.yml
@@ -4,7 +4,6 @@
 - system.linux.system.single.debian
 - system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo_local.mcp.apt_mirantis.openstack
-- system.openssh.client.lab
 - system.salt.master.pkg
 - system.salt.master.api
 - system.salt.master.formula.pkg.manila
diff --git a/classes/cluster/virtual-offline-ssl/init.yml b/classes/cluster/virtual-offline-ssl/init.yml
index 791c70d..cbbe7e6 100644
--- a/classes/cluster/virtual-offline-ssl/init.yml
+++ b/classes/cluster/virtual-offline-ssl/init.yml
@@ -9,6 +9,7 @@
 - system.openssh.server.team.lab
 - system.openssh.server.team.tcpcloud
 - system.openssh.server.team.mcp_qa
+- system.auditd.server.ciscat
 - cluster.virtual-offline-ssl.infra
 - cluster.virtual-offline-ssl.openstack
 parameters: