diff --git a/metadata.json b/metadata.json
index a483a44..8126a0a 100644
--- a/metadata.json
+++ b/metadata.json
@@ -39,6 +39,13 @@
         "8"
       ]
     },
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "8",
+        "9"
+      ]
+    },
     {
       "operatingsystem": "Gentoo",
       "operatingsystemrelease": [
diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb
index 156ad75..c65d1d1 100644
--- a/spec/acceptance/class_spec.rb
+++ b/spec/acceptance/class_spec.rb
@@ -28,15 +28,18 @@
     client_packages = %w[nfs-common nfs4-acl-tools rpcbind]
 
   when 'RedHat'
-    case fact('os.release.major')
-    when '6'
+    case fact('os.release.major').to_i
+    when 6
       # server_service = 'nfs'
       server_servicehelpers = %w[rpcidmapd rpcbind]
       client_services = %w[rpcbind]
-    when '7'
+    when 7
       # server_service = 'nfs-server.service'
       server_servicehelpers = %w[nfs-idmap.service]
       client_services = %w[rpcbind.service rpcbind.socket]
+    when >= 8
+      server_servicehelpers = %w[nfs-idmapd.service]
+      client_services = %w[rpcbind.service rpcbind.socket]
     end
     server_packages = %w[nfs-utils nfs4-acl-tools rpcbind]
     client_packages = %w[nfs-utils nfs4-acl-tools rpcbind]