diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 3e906f717d..4095943939 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -815,6 +815,7 @@ outputs:
                 docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
                 docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
                 tripleo_minor_update: true
+                tripleo_redhat_enforce: {{role.rhsm_enforce|default("true")}}
               tasks:
                 - import_tasks: hiera_steps_tasks.yaml
                 - import_tasks: common_container_config_scripts.yaml
diff --git a/roles/CephFile.yaml b/roles/CephFile.yaml
index 11df0509d4..7bcc7a9f3e 100644
--- a/roles/CephFile.yaml
+++ b/roles/CephFile.yaml
@@ -12,6 +12,7 @@
   HostnameFormatDefault: '%stackname%-ceph-file-%index%'
   # CephOSD present so serial has to be 1
   update_serial: 1
+  rhsm_enforce: False
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD
diff --git a/roles/CephObject.yaml b/roles/CephObject.yaml
index bdf2119e17..177ac7976e 100644
--- a/roles/CephObject.yaml
+++ b/roles/CephObject.yaml
@@ -12,6 +12,7 @@
   HostnameFormatDefault: '%stackname%-ceph-object-%index%'
   # CephOSD present so serial has to be 1
   update_serial: 1
+  rhsm_enforce: False
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD
diff --git a/roles/CephStorage.yaml b/roles/CephStorage.yaml
index 22abc4e7f8..420b78d3ae 100644
--- a/roles/CephStorage.yaml
+++ b/roles/CephStorage.yaml
@@ -13,6 +13,7 @@
   deprecated_nic_config_name: 'ceph-storage.yaml'
   # CephOSD present so serial has to be 1
   update_serial: 1
+  rhsm_enforce: False
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD
diff --git a/roles/README.rst b/roles/README.rst
index f1a359843c..feaff8e956 100644
--- a/roles/README.rst
+++ b/roles/README.rst
@@ -72,6 +72,12 @@ Role Options
    configuration would be skipped for the role. The names should match
    those defined in network_data.yaml
 
+* rhsm_enforce: (boolean), optional, default to true. Some role may
+  not follow the EUS stream constraint, like CephOSD or composed Ceph
+  Mon/Mgr. This switch ensures that we can model this and disable the
+  check when it is not needed. Note that on non Red Hat environment
+  this switch has no effect.
+
 Working with Roles
 ==================
 The tripleoclient provides a series of commands that can be used to view
diff --git a/roles_data.yaml b/roles_data.yaml
index 140cb1d114..ac92d9be03 100644
--- a/roles_data.yaml
+++ b/roles_data.yaml
@@ -383,6 +383,7 @@
   deprecated_nic_config_name: 'ceph-storage.yaml'
   # CephOSD present so serial has to be 1
   update_serial: 1
+  rhsm_enforce: False
   ServicesDefault:
     - OS::TripleO::Services::Aide
     - OS::TripleO::Services::AuditD