diff --git a/roles/barbican/vars/main.yml b/roles/barbican/vars/main.yml
index 63307e1..7eb2c78 100644
--- a/roles/barbican/vars/main.yml
+++ b/roles/barbican/vars/main.yml
@@ -23,10 +23,6 @@
     barbican:
       DEFAULT:
         log_config_append: null
-      keystone_authtoken:
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: key-manager
       oslo_messaging_notifications:
         driver: noop
       simple_crypto_plugin:
diff --git a/roles/cinder/vars/main.yml b/roles/cinder/vars/main.yml
index 707728f..bc30b07 100644
--- a/roles/cinder/vars/main.yml
+++ b/roles/cinder/vars/main.yml
@@ -34,10 +34,6 @@
         barbican_endpoint_type: internal
       cors:
         allowed_origins: "*"
-      keystone_authtoken:
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: volumev3
       oslo_messaging_notifications:
         driver: noop
   manifests:
diff --git a/roles/designate/vars/main.yml b/roles/designate/vars/main.yml
index db8110c..09ac03c 100644
--- a/roles/designate/vars/main.yml
+++ b/roles/designate/vars/main.yml
@@ -18,10 +18,6 @@
     tags: "{{ atmosphere_images | vexxhost.atmosphere.openstack_helm_image_tags('designate') }}"
   conf:
     designate:
-      keystone_authtoken:
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: dns
       service:central:
         managed_resource_tenant_id: "{{ _designate_project_info.openstack_projects[0].id }}"
     pools: "{{ designate_pools | to_yaml }}"
diff --git a/roles/glance/vars/main.yml b/roles/glance/vars/main.yml
index 5523c2e..9f62885 100644
--- a/roles/glance/vars/main.yml
+++ b/roles/glance/vars/main.yml
@@ -45,10 +45,6 @@
         allowed_origins: "*"
       image_format:
         disk_formats: "qcow2,raw"
-      keystone_authtoken:
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: image
       oslo_messaging_notifications:
         driver: noop
   manifests:
diff --git a/roles/heat/vars/main.yml b/roles/heat/vars/main.yml
index c8d233c..3104161 100644
--- a/roles/heat/vars/main.yml
+++ b/roles/heat/vars/main.yml
@@ -43,10 +43,6 @@
         workers: 8
       heat_api_cloudwatch:
         workers: 8
-      keystone_authtoken:
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: orchestration
       oslo_messaging_notifications:
         driver: noop
   manifests:
diff --git a/roles/magnum/vars/main.yml b/roles/magnum/vars/main.yml
index 0bf74ca..e7a092c 100644
--- a/roles/magnum/vars/main.yml
+++ b/roles/magnum/vars/main.yml
@@ -51,9 +51,6 @@
         # NOTE(mnaser): Magnum does not allow changing the interface to internal
         #               so we workaround with this for now.
         insecure: true
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: container-infra
       magnum_client:
         region_name: "{{ openstack_helm_endpoints_magnum_region_name }}"
       manila_client:
diff --git a/roles/manila/vars/main.yml b/roles/manila/vars/main.yml
index 9120b63..839ac74 100644
--- a/roles/manila/vars/main.yml
+++ b/roles/manila/vars/main.yml
@@ -54,10 +54,6 @@
         service_image_name: "{{ manila_image_name }}"
         service_instance_flavor_id: "{{ _manila_flavor.id }}"
         service_instance_security_group: manila-service-security-group
-      keystone_authtoken:
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: sharev2
       oslo_messaging_notifications:
         driver: noop
   manifests:
diff --git a/roles/neutron/vars/main.yml b/roles/neutron/vars/main.yml
index 27fcda7..a81fa70 100644
--- a/roles/neutron/vars/main.yml
+++ b/roles/neutron/vars/main.yml
@@ -37,10 +37,6 @@
         live_migration_events: true
       oslo_messaging_notifications:
         driver: noop
-      keystone_authtoken:
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: network
       service_providers:
         service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
     dhcp_agent:
diff --git a/roles/nova/vars/main.yml b/roles/nova/vars/main.yml
index 7984a38..0271471 100644
--- a/roles/nova/vars/main.yml
+++ b/roles/nova/vars/main.yml
@@ -81,10 +81,6 @@
         max_instances_per_host: 200
       glance:
         enable_rbd_download: true
-      keystone_authtoken:
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: compute
       libvirt:
         live_migration_scheme: tls
         # TODO(mnaser): We should enable this once we figure out how to "inject"
diff --git a/roles/octavia/vars/main.yml b/roles/octavia/vars/main.yml
index 1cbff82..a137ae5 100644
--- a/roles/octavia/vars/main.yml
+++ b/roles/octavia/vars/main.yml
@@ -106,10 +106,6 @@
       health_manager:
         controller_ip_port_list: "{{ _octavia_controller_ip_port_list | sort | join(',') }}"
         heartbeat_key: "{{ octavia_heartbeat_key }}"
-      keystone_authtoken:
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: load-balancer
       oslo_messaging_notifications:
         driver: noop
       neutron:
diff --git a/roles/placement/vars/main.yml b/roles/placement/vars/main.yml
index 10e32ae..322a0ba 100644
--- a/roles/placement/vars/main.yml
+++ b/roles/placement/vars/main.yml
@@ -23,10 +23,6 @@
     placement:
       DEFAULT:
         log_config_append: null
-      keystone_authtoken:
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: placement
       oslo_messaging_notifications:
         driver: noop
   manifests:
diff --git a/roles/senlin/vars/main.yml b/roles/senlin/vars/main.yml
index f48bddb..6f62432 100644
--- a/roles/senlin/vars/main.yml
+++ b/roles/senlin/vars/main.yml
@@ -26,10 +26,6 @@
     senlin:
       DEFAULT:
         log_config_append: null
-      keystone_authtoken:
-        # NOTE(okozachenko1203): We can remove it once the following is merged:
-        #                        https://review.opendev.org/883066
-        service_type: clustering
       oslo_messaging_notifications:
         driver: noop
   manifests: