diff --git a/ansible/roles/keystone/tasks/distribute_fernet.yml b/ansible/roles/keystone/tasks/distribute_fernet.yml
index 184acac840..f5c12b8031 100644
--- a/ansible/roles/keystone/tasks/distribute_fernet.yml
+++ b/ansible/roles/keystone/tasks/distribute_fernet.yml
@@ -11,7 +11,7 @@
 
 - name: Run key distribution
   become: true
-  command: docker exec -t keystone_fernet /usr/bin/fernet-push.sh
+  command: docker exec -t "{{ keystone_services['keystone-fernet']['container_name'] }}" /usr/bin/fernet-push.sh
   run_once: True
   delegate_to: >-
     {% if groups['keystone_fernet_running'] is defined -%}
diff --git a/ansible/roles/keystone/tasks/register.yml b/ansible/roles/keystone/tasks/register.yml
index 69dffd9405..957e2a7f9c 100644
--- a/ansible/roles/keystone/tasks/register.yml
+++ b/ansible/roles/keystone/tasks/register.yml
@@ -1,7 +1,7 @@
 ---
 - name: Creating admin project, user, role, service, and endpoint
   become: true
-  command: docker exec keystone kolla_keystone_bootstrap {{ openstack_auth.username }} {{ openstack_auth.password }} {{ openstack_auth.project_name }} admin {{ keystone_admin_url }} {{ keystone_internal_url }} {{ keystone_public_url }} {{ item }}
+  command: docker exec "{{ keystone_services['keystone']['container_name']  }}" kolla_keystone_bootstrap {{ openstack_auth.username }} {{ openstack_auth.password }} {{ openstack_auth.project_name }} admin {{ keystone_admin_url }} {{ keystone_internal_url }} {{ keystone_public_url }} {{ item }}
   register: keystone_bootstrap
   changed_when: (keystone_bootstrap.stdout | from_json).changed
   failed_when: (keystone_bootstrap.stdout | from_json).failed