diff --git a/manifests/install.pp b/manifests/install.pp
index 1c8b2ff..92c4b5b 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -3,8 +3,11 @@
   $package_version = $::dsu::package_version,
   ) {
 
-    package {$package_name:
-      ensure  => $package_version,
-      require => Class['::dsu::repo'],
+
+    if $::operatingsystemmajrelease in ['7','8'] {
+      package {$package_name:
+        ensure  => $package_version,
+        require => Class['::dsu::repo'],
+      }
     }
 }
diff --git a/manifests/params.pp b/manifests/params.pp
index 8126ea5..007f245 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -14,7 +14,8 @@
     'srvadmin-oslog', 'srvadmin-realssd', 'srvadmin-server-cli', 'srvadmin-server-snmp', 'srvadmin-smcommon', 'srvadmin-smweb',
     'srvadmin-standardAgent', 'srvadmin-storage', 'srvadmin-storage-cli', 'srvadmin-storage-snmp', 'srvadmin-storageservices',
     'srvadmin-storageservices-cli', 'srvadmin-storageservices-snmp', 'srvadmin-storelib', 'srvadmin-storelib-sysfs', 'srvadmin-sysfsutils',
-    'srvadmin-xmlsup',]
+  'srvadmin-xmlsup',]
+  $srvadmin_packages_no_java_rhel_9 = ['srvadmin-argtable2', 'srvadmin-base', 'srvadmin-hapi', 'srvadmin-idrac', 'srvadmin-idracadm7', 'srvadmin-oslog', 'srvadmin-server-cli', 'srvadmin-storageservices']
   $srvadmin_version = 'latest'
   $srvadmin_services = ['dsm_sa_eventmgrd','dsm_sa_datamgrd','dsm_sa_snmpd','dsm_om_shrsvc','instsvcdrv']
   $srvadmin_services_enable = true
diff --git a/manifests/srvadmin/install.pp b/manifests/srvadmin/install.pp
index 548c7d4..4ec6247 100644
--- a/manifests/srvadmin/install.pp
+++ b/manifests/srvadmin/install.pp
@@ -3,27 +3,33 @@
   $srvadmin_package = $::dsu::srvadmin_package,
   $srvadmin_packages_java = $::dsu::srvadmin_packages_java,
   $srvadmin_packages_no_java = $::dsu::srvadmin_packages_no_java,
+  $srvadmin_packages_no_java_rhel_9 = $::dsu::srvadmin_packages_no_java_rhel_9,
   $srvadmin_version = $::dsu::srvadmin_version,
   $srvadmin_services = $::dsu::srvadmin_services,
   $srvadmin_java = 'srvadmin-jre',
-  ) {
-    notify{"start installing srvadmin packages, services: ${srvadmin_services}":}
-    notify{"Limit selection boolean: ${srvadmin_install_limited}:${::dsu::srvadmin_install_limited}, all packages boolean: ${srvadmin_install_all}, single package list: ${$srvadmin_package}":}
-    if $srvadmin_install_all == true {
-      notify{"srvadmin_package: install single meta package":}
-      package {
-        $srvadmin_package:
-          ensure  => $srvadmin_version,
-          require => Class['::dsu::repo'],
-      }
+) {
+  notify { "start installing srvadmin packages, services: ${srvadmin_services}": }
+  notify { "Limit selection boolean: ${srvadmin_install_limited}:${::dsu::srvadmin_install_limited}, all packages boolean: ${srvadmin_install_all}, single package list: ${$srvadmin_package}": }
+  if $srvadmin_install_all == true {
+    notify { 'srvadmin_package: install single meta package': }
+    package {
+      $srvadmin_package:
+        ensure  => $srvadmin_version,
+        require => Class['::dsu::repo'],
     }
-    else {
-      notify{"srvadmin_packages: will install multiple packages":}
-      include ::dsu::repo
+  }
+  else {
+    notify { 'srvadmin_packages: will install multiple packages': }
+    include ::dsu::repo
+    if $::operatingsystemmajrelease in ['7','8'] {
       #Install select dell packages from packages Array
-      ensure_packages ($srvadmin_packages_no_java, {ensure => present})
-      notify{"srvadmin_packages: installed multiple packages: ${srvadmin_packages}":}
-      # If installed this will uninstall srvadmin-jre, -tomcat, -wenbserver, -all
-      ensure_packages ($srvadmin_packages_java, {ensure => absent})
+      ensure_packages ($srvadmin_packages_no_java, { ensure => present })
+    }
+    else {
+      ensure_packages ($srvadmin_packages_no_java_rhel_9, { ensure => present })
     }
+    notify { 'srvadmin_packages: installed multiple packages': }
+    # If installed this will uninstall srvadmin-jre, -tomcat, -wenbserver, -all
+    ensure_packages ($srvadmin_packages_java, { ensure => absent })
+  }
 }