diff --git a/defaults/main.yml b/defaults/main.yml
index 3c04b987..defc4f15 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -108,11 +108,8 @@ octavia_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(o
 octavia_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(octavia_service_proto) }}"
 octavia_service_type: load-balancer
 octavia_service_publicuri: "{{ octavia_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ octavia_service_port }}"
-octavia_service_publicurl_v2: "{{ octavia_service_publicuri }}/"
 octavia_service_adminuri: "{{ octavia_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ octavia_service_port }}"
-octavia_service_adminurl_v2: "{{ octavia_service_adminuri }}"
 octavia_service_internaluri: "{{ octavia_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ octavia_service_port }}"
-octavia_service_internalurl_v2: "{{ octavia_service_internaluri }}"
 
 octavia_service_in_ldap: false
 
diff --git a/tasks/octavia_service_add.yml b/tasks/octavia_service_add.yml
index 1c51a87e..b31cab64 100644
--- a/tasks/octavia_service_add.yml
+++ b/tasks/octavia_service_add.yml
@@ -83,11 +83,11 @@
     service_type: "{{ octavia_service_type }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
     endpoint_list:
-      - url: "{{ octavia_service_publicurl_v2 }}"
+      - url: "{{ octavia_service_publicuri }}"
         interface: "public"
-      - url: "{{ octavia_service_internalurl_v2 }}"
+      - url: "{{ octavia_service_internaluri }}"
         interface: "internal"
-      - url: "{{ octavia_service_adminurl_v2 }}"
+      - url: "{{ octavia_service_adminuri }}"
         interface: "admin"
   register: add_service_v2
   until: add_service_v2|success
diff --git a/tests/os_octavia-overrides.yml b/tests/os_octavia-overrides.yml
index 503ca63f..de997dc5 100644
--- a/tests/os_octavia-overrides.yml
+++ b/tests/os_octavia-overrides.yml
@@ -35,9 +35,9 @@ octavia_system_home_folder: "/var/lib/{{ octavia_system_user_name }}"
 octavia_venv_tag: "testing"
 octavia_developer_mode: True
 octavia_git_install_branch: master
-octavia_service_internalurl_v2: "http://{{ test_octavia_api_host }}:9876"
-octavia_service_adminurl_v2: "{{ octavia_service_internalurl_v2 }}"
-octavia_service_publicurl_v2: "{{ octavia_service_internalurl_v2 }}"
+octavia_service_internaluri: "http://{{ test_octavia_api_host }}:9876"
+octavia_service_adminuri: "{{ octavia_service_internaluri }}"
+octavia_service_publicuri: "{{ octavia_service_internaluri }}"
 
 octavia_service_password: "secrete"
 octavia_service_name: octavia