diff --git a/ansible/roles/zun/tasks/register.yml b/ansible/roles/zun/tasks/register.yml
index f44951263a776c2ac5b661fb438d4f781d814b30..40b6609e556f960bdc26f14cd3a87dcbc74769dc 100644
--- a/ansible/roles/zun/tasks/register.yml
+++ b/ansible/roles/zun/tasks/register.yml
@@ -3,8 +3,8 @@
   kolla_toolbox:
     module_name: "kolla_keystone_service"
     module_args:
-      service_name: "{{ item.service_name }}"
-      service_type: "{{ item.service_type }}"
+      service_name: "zun"
+      service_type: "container"
       description: "Container Service"
       endpoint_region: "{{ openstack_region_name }}"
       url: "{{ item.url }}"
@@ -13,10 +13,6 @@
       auth: "{{ '{{ openstack_zun_auth }}' }}"
     module_extra_vars:
       openstack_zun_auth: "{{ openstack_zun_auth }}"
-  register: zun_endpoint
-  until: zun_endpoint|success
-  retries: 10
-  delay: 5
   run_once: True
   with_items:
     - {'interface': 'admin', 'url': '{{ zun_admin_endpoint }}'}
@@ -35,8 +31,4 @@
       auth: "{{ '{{ openstack_zun_auth }}' }}"
     module_extra_vars:
       openstack_zun_auth: "{{ openstack_zun_auth }}"
-  register: zun_user
-  until: zun_user|success
-  retries: 10
-  delay: 5
   run_once: True