diff --git a/common/contrail_services.py b/common/contrail_services.py
index cf1a90165..c5c794e3d 100644
--- a/common/contrail_services.py
+++ b/common/contrail_services.py
@@ -14,12 +14,12 @@
     'webui-middleware': ['webui_job', 'contrail-webui-middleware'],
     'config-rabbitmq': ['configdatabase_rabbitmq', 'rabbitmq'],
     'config-zookeeper': ['configdatabase_zookeeper',
-                         'contrail-config-zookeeper'],
-    'config-cassandra': ['configdatabase_cassandra', 'contrail-configdb'],
+                         'contrail-config-zookeeper', 'config_database_zookeeper'],
+    'config-cassandra': ['configdatabase_cassandra', 'contrail-configdb', 'config_database_cassandra'],
     'analytics-zookeeper': ['analyticsdatabase_zookeeper',
-                            'contrail-analytics-zookeeper'],
+                            'contrail-analytics-zookeeper', 'analytics_database_zookeeper'],
     'analytics-cassandra': ['analyticsdatabase_cassandra',
-                            'contrail-analyticsdb'],
+                            'contrail-analyticsdb', 'analytics_database_cassandra'],
     'nova': ['nova_api', 'nova-api-osapi'],
     'nova-compute': ['nova_compute', 'nova-compute'],
     'nova-conductor': ['nova_conductor', 'nova-conductor'],
@@ -36,7 +36,7 @@
     'analytics-nodemgr': ['analytics_nodemgr', 'analytics-nodemgr'],
     'control-nodemgr': ['control_nodemgr', 'control-nodemgr'],
     'analyticsdb-nodemgr': ['analyticsdatabase_nodemgr',
-                            'analyticsdb-nodemgr'],
+                            'analyticsdb-nodemgr', 'analytics_database_nodemgr'],
     'contrail-kube-manager': ['contrail-kube-manager', 'kubemanager'],
     'kube-apiserver':  ['kube-apiserver']
 }