diff --git a/clusters/grid/umd4/profiles/nagios3-server.example.org.tpl.NOT_WORKING b/clusters/grid/umd4/profiles/nagios3-server.example.org.tpl.NOT_WORKING
deleted file mode 100644
index 0858684..0000000
--- a/clusters/grid/umd4/profiles/nagios3-server.example.org.tpl.NOT_WORKING
+++ /dev/null
@@ -1,69 +0,0 @@
-#Server Nagios: template quattor for nagios3
-############################
-
-object template nagios3-server.example.org;
-
-############
-#Fonctionnalite UI utile pour nagios service grille
-variable VOS ?= list('grif','dteam');
-include { 'machine-types/ui' };
-############
-
-#include Nagios server 
-##############################
-##What resources are monitored
-variable SITES = list('dapnia');
-include { 'config/nodes_properties' };
-
-##############################
-###Configuration, setting variables
-variable NAGIOS_NCG_CONFIG = true;
-variable NAGIOS_NOTIFICATIONS_ENABLED = false;
-variable NAGIOS_NODES_PROPERTIES   = NODES_PROPS;
-variable NAGIOS_DEFAULT_ADMIN_NAME = "dapnia";
-variable NAGIOS_IGNORED_NODES = list("node09.org.fr","node19.org.fr","node22.org.fr");
-variable NAGIOS_MONITORED_HOSTGROUPS = list("WN","NFS","SEDPM","SE_DISK","SITE_BDII","MON","LFC","CE","CE-MPI","VOBOX","UI","WMS");
-variable NAGIOS_ADMIN_CONTACTS= nlist(
-	"admin1"	,"admin1@org.fr",
-	"admin2" 	,"admin2@org.fr"
-	);
-variable NAGIOS_HTPASSWD_LOGIN ?= "me";
-variable NAGIOS_HTPASSWD_PASS  ?= 'xxxxx';
-###################
-variable NAGIOS_MODE_PROXY_RENEW = false;
-variable NAGIOS_MODE_PROXY_RETRIEVE = true;
-##############################
-###setting variables for proxy Renewal
-variable NAGIOS_RENEW_PROXY = "/opt/vobox/vo.grif.fr/proxy_repository/xxxxxx";
-variable NAGIOS_OUTPUT_PROXY = "/etc/nagios/globus/userproxy.pem";
-variable NAGIOS_VONAME_PROXY = "vo.grif.fr";
-
-##############################
-###setting variables for proxy Retrieval
-variable NAGIOS_MYPROXY_NAME = "mynagios";
-variable MYPROXY_SERVER = "myproxy.org.fr";
-##############################
-###Functions used to configure services and hosts
-include { 'monitoring/nagios3/server/functions' };
-
-##############################
-###Services configuration
-variable TMP_SERVICE=nlist(
-    "use","                             generic-service",
-    "host_name","                       node07.org.fr",
-    "service_description","             Workers ssh_known_hosts",
-    "contact_groups","                  admins",
-    "check_command","                   check_nrpe_long!check_ssh_known_hosts!60",
-    "normal_check_interval","           60 ; check every hour",
-    "max_check_attempts","              1",
-);
-variable NAGIOS_SERVICES=nagios_add_service(TMP_SERVICE);
-variable NAGIOS_USER_DEFINED_HOST_DEPENDENCIES=nagios_add_host_service_dependency("node07.org.fr","nrpe daemon","node07.org.fr","Workers ssh_known_hosts");
-include { 'monitoring/nagios3/server/config' };
-
-###
-#
-# software repositories (should be last)
-#
-include { 'rpms/siteupdates' };
-include { PKG_REPOSITORY_CONFIG };
diff --git a/clusters/grid/umd4/profiles/px.example.org.tpl.disabled b/clusters/grid/umd4/profiles/px.example.org.pan.disabled
similarity index 100%
rename from clusters/grid/umd4/profiles/px.example.org.tpl.disabled
rename to clusters/grid/umd4/profiles/px.example.org.pan.disabled
diff --git a/clusters/grid/umd4/site/cluster_info.pan b/clusters/grid/umd4/site/cluster_info.pan
index a1ecbb0..ae73324 100644
--- a/clusters/grid/umd4/site/cluster_info.pan
+++ b/clusters/grid/umd4/site/cluster_info.pan
@@ -26,13 +26,10 @@ variable ENABLE_MPI ?= false;
 # phase and to reset it to false afterwards.
 # You can also override the default value defined here in a specific profile.
 variable AII_V2_INSTALL ?= false;
-
 #
 # OS version definition
 #
 variable NODE_OS_VERSION_DB = "site/os/version_db";
-variable NODE_OS_VERSION_DEFAULT = "sl640-x86_64";
-
 
 # Default repository configuration template for the cluster
 variable PKG_REPOSITORY_CONFIG ?= 'repository/config';
diff --git a/sites/example/site/os/version_db.pan b/sites/example/site/os/version_db.pan
index 4c7ae1f..88bcb6b 100644
--- a/sites/example/site/os/version_db.pan
+++ b/sites/example/site/os/version_db.pan
@@ -14,7 +14,9 @@ unique template site/os/version_db;
 
 variable YUM_OS_DISTRIBUTION = {
     # Default per OS version
-    SELF['el7'] = 'centos71';
+    SELF['el9'] = 'al9';
+    SELF['el8'] = 'al8';
+    SELF['el7'] = 'centos7';
 
     # Explicit value per host name
     SELF['ui.example.org'] = 'centos7';
@@ -24,22 +26,25 @@ variable YUM_OS_DISTRIBUTION = {
 
 
 variable OS_VERSION = dict(
-    escape("cream.example.org"), "el7x-x86_64",
-    escape("dcache-head.example.org"), "el7x-i386",
-    escape("dcache-pool.example.org"), "el7x-i386",
-    escape("hydra.example.org"), "el7x-x86_64",
-    escape("lfc.example.org"), "el7x-x86_64",
-    escape("mon.example.org"), "el7x-x86_64",
-    escape("ui.example.org"), "el7x-x86_64",
-    escape("wmslb.example.org"), "el7x-x86_64",
-    escape("wn2.example.org"), "el7x-x86_64",
-    escape("xen-guest.example.org"), "el7x-x86_64",
-    escape("xen-host.example.org"), "el7x-x86_64",
-
-    escape("nagios-server.example.org"), "el7x-x86_64",
-    escape("nagios-master.example.org"), "el7x-x86_64",
-    escape("nagios-slave-A.example.org"), "el7x-x86_64",
-    escape("nagios-slave-B.example.org"), "el7x-x86_64",
+    # Grid cluster
+    '{apel.example.org}', 'el7x-x86_64',
+    '{argus.example.org}', 'el7x-x86_64',
+    '{bdii.example.org}', 'el7x-x86_64',
+    '{px.example.org}', 'el7x-x86_64',
+    '{se-dpm-disk2.example.org}', 'el7x-x86_64',
+    '{se-dpm-disk.example.org}', 'el7x-x86_64',
+    '{se-dpm-server.example.org}', 'el7x-x86_64',
+    '{topbdii.example.org}', 'el7x-x86_64',
+    '{ui.example.org}', 'el7x-x86_64',
+    '{wn2.example.org}', 'el7x-x86_64',
+    '{wn3.example.org}', 'el7x-x86_64',
+    '{wn.example.org}', 'el7x-x86_64',
+
+    # Misc cluster
+    '{nagios-server.example.org}', 'el7x-x86_64',
+    '{nagios-master.example.org}', 'el7x-x86_64',
+    '{nagios-slave-A.example.org}', 'el7x-x86_64',
+    '{nagios-slave-B.example.org}', 'el7x-x86_64',
 );