diff --git a/deployment/puppet/fuel/manifests/keystone.pp b/deployment/puppet/fuel/manifests/keystone.pp
index 1ccd25759d..4481446d5e 100644
--- a/deployment/puppet/fuel/manifests/keystone.pp
+++ b/deployment/puppet/fuel/manifests/keystone.pp
@@ -30,6 +30,9 @@ class fuel::keystone (
                    'python-unicodecsv', 'rubygem-thread_safe'])
 
   class { '::keystone':
+    # (TODO iberezovskiy): Set 'enable_bootstrap' to true when MOS packages will
+    # be updated and 'keystone-manage bootstrap' command will be available
+    enable_bootstrap => false,
     admin_token      => $admin_token,
     catalog_type     => 'sql',
     database_connection   => "${db_engine}://${db_user}:${db_password}@${db_host}:${db_port}/${db_name}",
diff --git a/deployment/puppet/openstack/manifests/keystone.pp b/deployment/puppet/openstack/manifests/keystone.pp
index e9bd5c1072..c1fb6f8347 100644
--- a/deployment/puppet/openstack/manifests/keystone.pp
+++ b/deployment/puppet/openstack/manifests/keystone.pp
@@ -118,6 +118,9 @@ class openstack::keystone (
 
   if $enabled {
     class { '::keystone':
+      # (TODO iberezovskiy): Set 'enable_bootstrap' to true when MOS packages will
+      # be updated and 'keystone-manage bootstrap' command will be available
+      enable_bootstrap             => false,
       verbose                      => $verbose,
       debug                        => $debug,
       catalog_type                 => 'sql',
diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb
index 97870cf89c..023e1d8055 100644
--- a/tests/noop/spec/hosts/keystone/keystone_spec.rb
+++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb
@@ -108,6 +108,11 @@ describe manifest do
       )
     end
 
+    # (TODO iberezovskiy):Remove this after MOS Packages will be updated
+    it 'should disable keystone bootstrap' do
+      should contain_class('keystone').with('enable_bootstrap' => false)
+    end
+
     it 'should declare openstack::keystone class with public_url,admin_url,internal_url' do
       should contain_class('openstack::keystone').with(
         'public_url'   => public_url,