diff --git a/tasks/neutron_service_add.yml b/tasks/neutron_service_add.yml
index 11737744..877049ff 100644
--- a/tasks/neutron_service_add.yml
+++ b/tasks/neutron_service_add.yml
@@ -60,7 +60,7 @@
     endpoint: "{{ keystone_service_adminurl }}"
     user_name: "{{ service_user_name }}"
     tenant_name: "{{ service_tenant_name }}"
-    role_name: "{{ role_name }}"
+    role_name: "{{ neutron_service_role_name }}"
     insecure: "{{ keystone_service_adminuri_insecure }}"
   register: add_service
   when: not neutron_service_in_ldap | bool
diff --git a/tasks/neutron_service_setup.yml b/tasks/neutron_service_setup.yml
index 524bdf05..f7855979 100644
--- a/tasks/neutron_service_setup.yml
+++ b/tasks/neutron_service_setup.yml
@@ -25,6 +25,5 @@
     service_publicurl: "{{ neutron_service_publicurl }}"
     service_internalurl: "{{ neutron_service_internalurl }}"
     service_adminurl: "{{ neutron_service_adminurl }}"
-    role_name: "{{ neutron_service_role_name }}"
   tags:
     - neutron-server