diff --git a/tasks/octavia_amp_image.yml b/tasks/octavia_amp_image.yml
index 5d0e54b1..aeacb29c 100644
--- a/tasks/octavia_amp_image.yml
+++ b/tasks/octavia_amp_image.yml
@@ -48,7 +48,7 @@
         cloud: default
         region_name: "{{ octavia_service_region }}"
         image: amphora-x64-haproxy
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
       when:
          - octavia_download_result | changed
@@ -75,7 +75,7 @@
         state: absent
         region_name: "{{ octavia_service_region }}"
         id: "{{ openstack.id }}"
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
       when:
        - openstack is defined # result from os_image_facts
diff --git a/tasks/octavia_mgmt_network.yml b/tasks/octavia_mgmt_network.yml
index 2c06d7e8..09967611 100644
--- a/tasks/octavia_mgmt_network.yml
+++ b/tasks/octavia_mgmt_network.yml
@@ -79,7 +79,7 @@
         cloud: default
         region_name: "{{ octavia_service_region }}"
         name: "{{ octavia_neutron_management_network_name }}"
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
       register: get_net_facts
       until: get_net_facts is success
diff --git a/tasks/octavia_security_group.yml b/tasks/octavia_security_group.yml
index 7f4aae8b..8d855695 100644
--- a/tasks/octavia_security_group.yml
+++ b/tasks/octavia_security_group.yml
@@ -36,7 +36,7 @@
         state: present
         name: "{{ octavia_security_group_name }}"
         description: "security group for octavia amphora"
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
 
     - name: Create security group rule for agent
@@ -54,7 +54,7 @@
         port_range_max: "{{ octavia_agent_port }}"
         remote_ip_prefix: "{{ octavia_security_group_rule_cidr }}"
         security_group: "{{ octavia_security_group_name }}"
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
 
     - name: Create security group rule for ssh
@@ -72,7 +72,7 @@
         port_range_min: 22
         port_range_max: 22
         remote_ip_prefix: "{{ octavia_security_group_rule_cidr }}"
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
       when:
         - octavia_ssh_enabled | bool
@@ -90,7 +90,7 @@
         security_group: "{{ octavia_security_group_name }}"
         protocol: icmp
         remote_ip_prefix: "{{ octavia_security_group_rule_cidr }}"
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
       when:
         - debug | bool
diff --git a/tasks/octavia_service_add.yml b/tasks/octavia_service_add.yml
index e449b9d8..97d1a7a9 100644
--- a/tasks/octavia_service_add.yml
+++ b/tasks/octavia_service_add.yml
@@ -31,7 +31,7 @@
         name: "{{ octavia_service_name }}"
         service_type: "{{ octavia_service_type }}"
         description: "{{ octavia_service_description }}"
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
       register: add_service
       until: add_service is success
@@ -46,7 +46,7 @@
         password: "{{ octavia_service_password }}"
         domain: default
         default_project: "{{ octavia_service_project_name }}"
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
       register: add_service
       when: not octavia_service_in_ldap | bool
@@ -62,7 +62,7 @@
         user: "{{ octavia_service_user_name }}"
         role: "{{ octavia_service_role_name }}"
         project: "{{ octavia_service_project_name }}"
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
       register: add_service
       when: not octavia_service_in_ldap | bool
@@ -78,7 +78,7 @@
         endpoint_interface: "{{ item.interface }}"
         url: "{{ item.url }}"
         region: "{{ octavia_service_region }}"
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
       register: add_service
       until: add_service is success
@@ -98,7 +98,7 @@
         cloud: default
         state: present
         name: "{{ item }}"
-        endpoint_type: admin
+        interface: admin
         verify: "{{ not keystone_service_adminuri_insecure }}"
       register: add_roles
       until: add_roles is success