diff --git a/etc/openstack_deploy/conf.d/cloudkitty.yml.aio b/etc/openstack_deploy/conf.d/cloudkitty.yml.aio
index cf4e4fb2c9..872c3d1a47 100644
--- a/etc/openstack_deploy/conf.d/cloudkitty.yml.aio
+++ b/etc/openstack_deploy/conf.d/cloudkitty.yml.aio
@@ -1,4 +1,4 @@
 # The controller host that will be running the cloudkitty services
-cloudkitty_hosts:
+rating_hosts:
   aio1:
-    ip: 172.29.236.100
\ No newline at end of file
+    ip: 172.29.236.100
diff --git a/etc/openstack_deploy/conf.d/cloudkitty.yml.example b/etc/openstack_deploy/conf.d/cloudkitty.yml.example
index 1337b7e32f..5dd9fa56bc 100644
--- a/etc/openstack_deploy/conf.d/cloudkitty.yml.example
+++ b/etc/openstack_deploy/conf.d/cloudkitty.yml.example
@@ -1,5 +1,5 @@
 # The infra nodes that will be running the cloudkitty services
-cloudkitty_hosts:
+rating_hosts:
   infra1:
     ip: 172.20.236.111
   infra2:
diff --git a/inventory/env.d/cloudkitty.yml b/inventory/env.d/cloudkitty.yml
index 25a53ca0ba..c1afa3980b 100644
--- a/inventory/env.d/cloudkitty.yml
+++ b/inventory/env.d/cloudkitty.yml
@@ -10,15 +10,15 @@ component_skel:
 container_skel:
   cloudkitty_container:
     belongs_to:
-      - cloudkitty_containers
+      - rating_containers
     contains:
       - cloudkitty_api
       - cloudkitty_engine
 
 physical_skel:
-  cloudkitty_containers:
+  rating_containers:
     belongs_to:
       - all_containers
-  cloudkitty_hosts:
+  rating_hosts:
     belongs_to:
       - hosts
diff --git a/releasenotes/notes/cloudkitty_to_rating_hosts-744f0e4a9315fbd1.yaml b/releasenotes/notes/cloudkitty_to_rating_hosts-744f0e4a9315fbd1.yaml
new file mode 100644
index 0000000000..7bb1c05b71
--- /dev/null
+++ b/releasenotes/notes/cloudkitty_to_rating_hosts-744f0e4a9315fbd1.yaml
@@ -0,0 +1,17 @@
+---
+
+upgrade:
+  - |
+    Ensure that in openstack_user_config.yml / conf.d ``cloudkitty_hosts`` are
+    replaced with ``rating_hosts``.
+    For deployments with LXC containers: after upgrade is completed make sure
+    that Cloudkitty is not running on your LXC hosts anymore, after which you
+    should be able to remove LXC hosts from cloudkitty_all group in inventory.
+
+fixes:
+  - |
+    Due to issue in env.d defenition for Cloudkitty, service was installed not
+    only inside LXC containers, but also to all LXC hosts, which was not
+    intended. This was fixed in env.d definition for the service, and it
+    was renamed from ``cloudkitty_hosts`` to ``rating_hosts``, which should be
+    reflected in your ``openstack_user_config.yml`` or conf.d files.
diff --git a/tests/test_inventory.py b/tests/test_inventory.py
index 32ef52074d..f68b766445 100644
--- a/tests/test_inventory.py
+++ b/tests/test_inventory.py
@@ -189,10 +189,11 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase):
         'cinder_volumes_container',
         'cloudkitty_all',
         'cloudkitty_api',
-        'cloudkitty_containers',
+        'rating_containers',
         'cloudkitty_container',
         'cloudkitty_engine',
-        'cloudkitty_hosts',
+        'rating_hosts',
+        'rating_all',
         'coordination_containers',
         'coordination_hosts',
         'compute-infra_all',