diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 7a65d66f..48ebf975 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -81,9 +81,12 @@ class dhcp6_client {
 }
 
 class entropyclient {
-   include sunet::simple_entropy
-   sunet::ucrandom {'random.nordu.net': ensure => absent }
-   sunet::nagios::nrpe_check_process { 'haveged': }
+   # Entropy is not needed on modern kernels, we should remove this class when done with SC-2522
+   if ($facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '22.04') <= 0 ){
+      include sunet::simple_entropy
+      sunet::ucrandom {'random.nordu.net': ensure => absent }
+      sunet::nagios::nrpe_check_process { 'haveged': }
+   }
 }
 
 class openstack_dockerhost {