diff --git a/classes/cluster/virtual-mcp11-aio/.env b/classes/cluster/virtual-mcp11-aio/.env
index 3e71038..a8c9936 100644
--- a/classes/cluster/virtual-mcp11-aio/.env
+++ b/classes/cluster/virtual-mcp11-aio/.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 runtest artifactory)
+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 iptables runtest artifactory)
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index e6e434d..a920e78 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -17,9 +17,7 @@
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
-- system.galera.server.database.barbican
 - system.keystone.client.single
-- system.keystone.client.service.barbican
 - system.keystone.client.service.cinder3
 - system.keystone.client.service.nova21
 - system.keystone.client.service.nova-placement
@@ -37,8 +35,6 @@
 - system.cinder.volume.backend.lvm
 - system.horizon.server.single
 - system.bind.server.single
-- system.barbican.server.single
-- service.barbican.server.plugin.simple_crypto
 - system.designate.server.single
 - system.designate.server.backend.bind
 - service.runtest.tempest
@@ -57,7 +53,6 @@
     keystone_internal_path: '/'
     keystone_admin_path: '/'
     keystone_version: ${_param:openstack_version}
-    barbican_version: ${_param:openstack_version}
     glance_version: ${_param:openstack_version}
     nova_version: ${_param:openstack_version}
     neutron_version: ${_param:openstack_version}
@@ -67,7 +62,6 @@
     designate_version: ${_param:openstack_version}
     keystone_service_token: workshop
     keystone_admin_password: workshop
-    keystone_barbican_password: workshop
     keystone_ceilometer_password: workshop
     keystone_cinder_password: workshop
     keystone_glance_password: workshop
@@ -77,14 +71,12 @@
     keystone_designate_password: workshop
     keystone_service_host: ${_param:single_address}
     mysql_keystone_password: workshop
-    mysql_barbican_password: workshop
     mysql_glance_password: workshop
     mysql_nova_password: workshop
     mysql_neutron_password: workshop
     mysql_cinder_password: workshop
     mysql_heat_password: workshop
     mysql_designate_password: workshop
-    barbican_service_host: ${_param:single_address}
     heat_service_host: ${_param:single_address}
     neutron_service_host: ${_param:single_address}
     glance_service_host: ${_param:single_address}
@@ -130,8 +122,6 @@
     openstack_public_neutron_subnet_cidr: 192.168.130.0/24
     openstack_public_neutron_subnet_allocation_start: 192.168.130.10
     openstack_public_neutron_subnet_allocation_end: 192.168.130.254
-    barbican_simple_crypto_kek: YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY=
-    barbican_integration_enabled: False
     galera_ssl_enabled: true
     rabbitmq_ssl_enabled: false # untill rabbitmq formula with https://gerrit.mcp.mirantis.net/#/c/15198/ promoted to stable
     rabbitmq_port: 5672 # for non-ssl use 5672/for ssl 5671
@@ -152,21 +142,6 @@
     server:
       ssl:
         enabled: ${_param:rabbitmq_ssl_enabled}
-  barbican:
-    server:
-      ks_notifications_enable: True
-      store:
-        software:
-          crypto_plugin: simple_crypto
-          store_plugin: store_crypto
-          global_default: True
-      database:
-        ssl:
-          enabled: ${_param:galera_ssl_enabled}
-      message_queue:
-        port: ${_param:rabbitmq_port}
-        ssl:
-          enabled: ${_param:rabbitmq_ssl_enabled}
   neutron:
     server:
       # Temporary install neutron-plugin-ml2 untill https://gerrit.mcp.mirantis.net/#/c/16262/ promoted
@@ -199,8 +174,6 @@
           enabled: ${_param:rabbitmq_ssl_enabled}
   nova:
     compute:
-      barbican:
-        enabled: ${_param:barbican_integration_enabled}
       vncproxy_url: http://${_param:single_address}:6080
       network:
         user: neutron
@@ -213,8 +186,6 @@
         ssl:
           enabled: ${_param:rabbitmq_ssl_enabled}
     controller:
-      barbican:
-        enabled: ${_param:barbican_integration_enabled}
       vncproxy_url: http://${_param:single_address}:6080
       database:
         ssl:
@@ -225,8 +196,6 @@
           enabled: ${_param:rabbitmq_ssl_enabled}
   cinder:
     controller:
-      barbican:
-        enabled: ${_param:barbican_integration_enabled}
       database:
         ssl:
           enabled: ${_param:galera_ssl_enabled}
@@ -268,8 +237,6 @@
     client:
       enabled: True
     server:
-      barbican:
-        enabled: ${_param:barbican_integration_enabled}
       database:
         ssl:
           enabled: ${_param:galera_ssl_enabled}