diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index 4dd8213b34..0f52334146 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -904,6 +904,11 @@ neutron_ks_users:
     password: "{{ neutron_keystone_password }}"
     role: "admin"
 
+neutron_ks_user_roles:
+  - project: "service"
+    user: "{{ neutron_keystone_user }}"
+    role: "service"
+
 ####################
 # SRIOV
 ####################
diff --git a/ansible/roles/neutron/tasks/register.yml b/ansible/roles/neutron/tasks/register.yml
index 1dc2e4dbc0..17a6ca2cb9 100644
--- a/ansible/roles/neutron/tasks/register.yml
+++ b/ansible/roles/neutron/tasks/register.yml
@@ -5,3 +5,4 @@
     service_ks_register_auth: "{{ openstack_neutron_auth }}"
     service_ks_register_services: "{{ neutron_ks_services }}"
     service_ks_register_users: "{{ neutron_ks_users }}"
+    service_ks_register_user_roles: "{{ neutron_ks_user_roles }}"
diff --git a/ansible/roles/neutron/tasks/upgrade.yml b/ansible/roles/neutron/tasks/upgrade.yml
index 9c223bc27c..ccc5b7cd7c 100644
--- a/ansible/roles/neutron/tasks/upgrade.yml
+++ b/ansible/roles/neutron/tasks/upgrade.yml
@@ -6,3 +6,10 @@
 
 - include_tasks: legacy_upgrade.yml
   when: not neutron_enable_rolling_upgrade | bool
+
+# TODO(mnasiadka): Remove this task in the E cycle.
+- import_role:
+    name: service-ks-register
+  vars:
+    service_ks_register_auth: "{{ openstack_neutron_auth }}"
+    service_ks_register_user_roles: "{{ neutron_ks_user_roles }}"