diff --git a/compiled/cern/global/frontend.xml b/compiled/cern/global/frontend.xml
index 9446554a1384f4970186f74886d6a28bc383feb3..14b3f1caacd938f90b180664a692e6f075678a57 100644
--- a/compiled/cern/global/frontend.xml
+++ b/compiled/cern/global/frontend.xml
@@ -212,8 +212,8 @@
             </credentials>
          </security>
          <attrs>
-            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-medium,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-medium"/>
-            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T2_US_Caltech"/>
+            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA"/>
+            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T1_DE_KIT,T2_US_Caltech"/>
          </attrs>
          <files>
          </files>
@@ -254,8 +254,8 @@
             </credentials>
          </security>
          <attrs>
-            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-medium,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-medium"/>
-            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T2_US_Caltech"/>
+            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA"/>
+            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T1_DE_KIT,T2_US_Caltech"/>
          </attrs>
          <files>
          </files>
diff --git a/compiled/cern/itb/frontend.xml b/compiled/cern/itb/frontend.xml
index f32a52c4cb46b763d7be4436bfed81b5eb1c4bcb..7a678e35bf939f441f422326863735961d0fbb51 100644
--- a/compiled/cern/itb/frontend.xml
+++ b/compiled/cern/itb/frontend.xml
@@ -202,8 +202,8 @@
             </credentials>
          </security>
          <attrs>
-            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-medium,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-medium"/>
-            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T2_US_Caltech"/>
+            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA"/>
+            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T1_DE_KIT,T2_US_Caltech"/>
          </attrs>
          <files>
          </files>
@@ -247,8 +247,8 @@
             </credentials>
          </security>
          <attrs>
-            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-medium,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-medium"/>
-            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T2_US_Caltech"/>
+            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA"/>
+            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T1_DE_KIT,T2_US_Caltech"/>
          </attrs>
          <files>
          </files>
diff --git a/compiled/cern/itbdev/frontend.xml b/compiled/cern/itbdev/frontend.xml
index 5e12a200c525172200d75135d6037e717f58f805..397667147d1379d2550b13815ae438a3e4b78536 100644
--- a/compiled/cern/itbdev/frontend.xml
+++ b/compiled/cern/itbdev/frontend.xml
@@ -169,8 +169,8 @@
             </credentials>
          </security>
          <attrs>
-            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-medium,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-medium"/>
-            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T2_US_Caltech"/>
+            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA"/>
+            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T1_DE_KIT,T2_US_Caltech"/>
          </attrs>
          <files>
          </files>
@@ -214,8 +214,8 @@
             </credentials>
          </security>
          <attrs>
-            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-medium,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-medium"/>
-            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T2_US_Caltech"/>
+            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA"/>
+            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T1_DE_KIT,T2_US_Caltech"/>
          </attrs>
          <files>
          </files>
diff --git a/compiled/fnal/global/frontend.xml b/compiled/fnal/global/frontend.xml
index 3f9c4dcff7f46cac3ce456027f44646ed71ec26c..137219562d63ef3458f06bcb25457931b0b9d04a 100644
--- a/compiled/fnal/global/frontend.xml
+++ b/compiled/fnal/global/frontend.xml
@@ -212,8 +212,8 @@
             </credentials>
          </security>
          <attrs>
-            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-medium,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-medium"/>
-            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T2_US_Caltech"/>
+            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA"/>
+            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T1_DE_KIT,T2_US_Caltech"/>
          </attrs>
          <files>
          </files>
@@ -254,8 +254,8 @@
             </credentials>
          </security>
          <attrs>
-            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-medium,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-medium"/>
-            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T2_US_Caltech"/>
+            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA"/>
+            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T1_DE_KIT,T2_US_Caltech"/>
          </attrs>
          <files>
          </files>
diff --git a/compiled/fnal/itb/frontend.xml b/compiled/fnal/itb/frontend.xml
index 65700374a5c54eef8b4aed2cebc611d134050def..8ad0122d9814a58fc5e74676f84e2394111f3543 100644
--- a/compiled/fnal/itb/frontend.xml
+++ b/compiled/fnal/itb/frontend.xml
@@ -202,8 +202,8 @@
             </credentials>
          </security>
          <attrs>
-            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-medium,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-medium"/>
-            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T2_US_Caltech"/>
+            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA"/>
+            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T1_DE_KIT,T2_US_Caltech"/>
          </attrs>
          <files>
          </files>
@@ -247,8 +247,8 @@
             </credentials>
          </security>
          <attrs>
-            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-medium,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-medium"/>
-            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T2_US_Caltech"/>
+            <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMSHTPC_T1_IT_CNAF_CINECA"/>
+            <attr name="GLIDEIN_CustomizeStart_Sitelist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="T1_IT_CNAF,T1_DE_KIT,T2_US_Caltech"/>
          </attrs>
          <files>
          </files>
diff --git a/inventory/classes/common.yml b/inventory/classes/common.yml
index f9921cfa8941d4135a6f723fc1dd023310810146..a216acd0bfd4c1f40e913c19120186b4badd14c7 100644
--- a/inventory/classes/common.yml
+++ b/inventory/classes/common.yml
@@ -122,12 +122,12 @@ parameters:
           glidein_publish: true
           job_publish: false
           parameter: true
-          value: "CMSHTPC_T1_IT_CNAF_CINECA,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-1-kit-medium,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-short,CMSHTPC_T1_DE_KIT_cloud-htcondor-ce-2-kit-medium"
+          value: "CMSHTPC_T1_IT_CNAF_CINECA"
         - name: GLIDEIN_CustomizeStart_Sitelist
           glidein_publish: true
           job_publish: false
           parameter: true
-          value: "T1_IT_CNAF,T2_US_Caltech"
+          value: "T1_IT_CNAF,T1_DE_KIT,T2_US_Caltech"