diff --git a/roles/DistributedCompute.yaml b/roles/DistributedCompute.yaml
index c3c7db728f..c4e40f29b9 100644
--- a/roles/DistributedCompute.yaml
+++ b/roles/DistributedCompute.yaml
@@ -30,7 +30,6 @@
     - OS::TripleO::Services::ComputeNeutronL3Agent
     - OS::TripleO::Services::ComputeNeutronMetadataAgent
     - OS::TripleO::Services::ComputeNeutronOvsAgent
-    - OS::TripleO::Services::Etcd
     - OS::TripleO::Services::GlanceApiEdge
     - OS::TripleO::Services::IpaClient
     - OS::TripleO::Services::Ipsec
diff --git a/roles/DistributedComputeHCI.yaml b/roles/DistributedComputeHCI.yaml
index e756ebc50a..cffb079d1a 100644
--- a/roles/DistributedComputeHCI.yaml
+++ b/roles/DistributedComputeHCI.yaml
@@ -21,6 +21,7 @@
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD
     - OS::TripleO::Services::BarbicanClient
+    - OS::TripleO::Services::BlockStorageCinderVolume
     - OS::TripleO::Services::BootParams
     - OS::TripleO::Services::CACerts
     - OS::TripleO::Services::CephClient
@@ -32,7 +33,6 @@
     - OS::TripleO::Services::CephRgw
     - OS::TripleO::Services::CephOSD
     - OS::TripleO::Services::CertmongerUser
-    - OS::TripleO::Services::BlockStorageCinderVolume
     - OS::TripleO::Services::Collectd
     - OS::TripleO::Services::ComputeCeilometerAgent
     - OS::TripleO::Services::ComputeNeutronCorePlugin
diff --git a/roles/DistributedComputeHCIScaleOut.yaml b/roles/DistributedComputeHCIScaleOut.yaml
index 2018b1448e..51ecce6a5f 100644
--- a/roles/DistributedComputeHCIScaleOut.yaml
+++ b/roles/DistributedComputeHCIScaleOut.yaml
@@ -3,7 +3,7 @@
 ###############################################################################
 - name: DistributedComputeHCIScaleOut
   description: |
-    Distributed Compute Node role with Ceph, Cinder volume and HAProxy for Glance.
+    Distributed Compute Node role with CephOSD and HAproxy for Glance.
   networks:
     InternalApi:
       subnet: internal_api_subnet
@@ -33,7 +33,6 @@
     - OS::TripleO::Services::ComputeNeutronL3Agent
     - OS::TripleO::Services::ComputeNeutronMetadataAgent
     - OS::TripleO::Services::ComputeNeutronOvsAgent
-    - OS::TripleO::Services::Etcd
     - OS::TripleO::Services::HAproxyEdge
     - OS::TripleO::Services::IpaClient
     - OS::TripleO::Services::Ipsec
diff --git a/roles/DistributedComputeScaleOut.yaml b/roles/DistributedComputeScaleOut.yaml
index a9ac546186..8b8842d487 100644
--- a/roles/DistributedComputeScaleOut.yaml
+++ b/roles/DistributedComputeScaleOut.yaml
@@ -3,7 +3,7 @@
 ###############################################################################
 - name: DistributedComputeScaleOut
   description: |
-    Distributed Compute Node role with Cinder volume and HaProxy for Glance.
+    Distributed Compute Node role with HAproxy for Glance.
   CountDefault: 1
   networks:
     InternalApi:
@@ -30,7 +30,6 @@
     - OS::TripleO::Services::ComputeNeutronL3Agent
     - OS::TripleO::Services::ComputeNeutronMetadataAgent
     - OS::TripleO::Services::ComputeNeutronOvsAgent
-    - OS::TripleO::Services::Etcd
     - OS::TripleO::Services::HAproxyEdge
     - OS::TripleO::Services::IpaClient
     - OS::TripleO::Services::Ipsec