diff --git a/recipes/_fernet_tokens.rb b/recipes/_fernet_tokens.rb
index 91f0c3b..01488ac 100644
--- a/recipes/_fernet_tokens.rb
+++ b/recipes/_fernet_tokens.rb
@@ -33,7 +33,8 @@ directory key_repository do
 end
 
 node['openstack']['identity']['fernet']['keys'].each do |key_index|
-  key = secret('keystone', "fernet_key#{key_index}")
+  key = secret(node['openstack']['secret']['secrets_data_bag'],
+               "fernet_key#{key_index}")
   file File.join(key_repository, key_index.to_s) do
     content key
     owner node['openstack']['identity']['user']
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 2f27e4a..c52df82 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -65,10 +65,10 @@ shared_context 'identity_stubs' do
       .with('user', 'admin')
       .and_return('admin')
     allow_any_instance_of(Chef::Recipe).to receive(:secret)
-      .with('keystone', 'fernet_key0')
+      .with('secrets', 'fernet_key0')
       .and_return('thisisfernetkey0')
     allow_any_instance_of(Chef::Recipe).to receive(:secret)
-      .with('keystone', 'fernet_key1')
+      .with('secrets', 'fernet_key1')
       .and_return('thisisfernetkey1')
     allow_any_instance_of(Chef::Recipe).to receive(:rabbit_transport_url)
       .with('identity')