diff --git a/compiled/cern/volunteer/frontend.xml b/compiled/cern/volunteer/frontend.xml
index 5e51aa4d2ee46ad5dc0e5112cf2371810216a865..a0f919c81833e5b88e8911bf85356a3722f29c51 100644
--- a/compiled/cern/volunteer/frontend.xml
+++ b/compiled/cern/volunteer/frontend.xml
@@ -53,7 +53,7 @@
       <credentials>
       </credentials>
    </security>
-   <stage base_dir="/var/lib/gwms-frontend/web-area/stage" use_symlink="True" web_base_url="http://vocms0840.cern.ch/vofrontend/stage"/>
+   <stage base_dir="/var/lib/gwms-frontend/web-area/stage" use_symlink="True" web_base_url="http://vocms0830.cern.ch/vofrontend/stage"/>
    <work base_dir="/var/lib/gwms-frontend/vofrontend" base_log_dir="/var/log/gwms-frontend"/>
    <attrs>
       <attr name="CMS_GLIDEIN_VERSION" glidein_publish="True" job_publish="True" parameter="True" type="int" value="32"/>
@@ -118,9 +118,6 @@
             </job>
          </match>
          <security idtoken_lifetime="240">
-            <credentials>
-               <credential absfname="/var/lib/gwms-frontend/.globus/x509_cmspilot06_cms_pilot.proxy" security_class="cmspilot" trust_domain="grid" type="grid_proxy"/>
-            </credentials>
          </security>
          <attrs>
             <attr name="GLIDEIN_CustomizeStart_Entrylist" glidein_publish="True" job_publish="False" parameter="True" type="string" value="CMS_T3_CH_Volunteer,CMS_T3_CH_CMSAtHome"/>
@@ -132,7 +129,7 @@
    <ccbs>
    </ccbs>
    <collectors>
-      <collector DN="/DC=ch/DC=cern/OU=computers/CN=vocms0840.cern.ch" group="c1" node="vocms0840.cern.ch" secondary="False"/>
+      <collector DN="/DC=ch/DC=cern/OU=computers/CN=vocms0830.cern.ch" group="c1" node="vocms0830.cern.ch" secondary="False"/>
    </collectors>
    <files>
       <file absfname="/data/gwms-frontend/repos/cms-validation-scripts/advertise_site_classads.sh" after_entry="True" after_group="True" const="True" executable="True" period="0" prefix="GLIDEIN_PS_" untar="False" wrapper="False">
diff --git a/inventory/classes/volunteer.yml b/inventory/classes/volunteer.yml
index a714cf93afc7f32ce3c2b31e93d6d165facee9c7..03ef91ed1083554bdf3f175c1cfa6240f87715da 100644
--- a/inventory/classes/volunteer.yml
+++ b/inventory/classes/volunteer.yml
@@ -87,7 +87,7 @@ parameters:
     factory_user: gfactory
     node: vocms0204.cern.ch
   my_identity: fecmsglobalitb
-  frontend_fqdn: vocms0840.cern.ch
+  frontend_fqdn: vocms0830.cern.ch
   # TODO: Deduplicate with global
   global_factory_expr: >-
     (stringListMember("CMS",GLIDEIN_Supported_VOs) || stringListMember("CMSGPU",GLIDEIN_Supported_VOs))&amp;&amp; (GLIDEIN_Max_Walltime=!=UNDEFINED) &amp;&amp; (GLIDEIN_Retire_Time_Spread=!=UNDEFINED) &amp;&amp; (GLIDEIN_MaxMemMBs=!=UNDEFINED) &amp;&amp; (GLIDEIN_CMSSite=!=UNDEFINED) &amp;&amp; (!stringListsIntersect("T2_CH_CERN_AI,T2_CH_CERN_HLT,T0_CH_CERN",GLIDEIN_CMSSite))
@@ -138,10 +138,6 @@ parameters:
       - name: DESIRED_Entries
       - name: DESIRED_Gatekeepers
       - name: DESIRED_Sites
-      credentials:
-      - absfname: "/var/lib/gwms-frontend/.globus/x509_cmspilot06_cms_pilot.proxy"
-        security_class: cmspilot
-        type: grid_proxy
       attrs:
       - name: GLIDEIN_CustomizeStart_Entrylist
         glidein_publish: true
@@ -149,9 +145,9 @@ parameters:
         parameter: true
         value: "CMS_T3_CH_Volunteer,CMS_T3_CH_CMSAtHome"
   collectors:
-  - DN: /DC=ch/DC=cern/OU=computers/CN=vocms0840.cern.ch
+  - DN: /DC=ch/DC=cern/OU=computers/CN=vocms0830.cern.ch
     group: c1
-    node: vocms0840.cern.ch
+    node: vocms0830.cern.ch
   schedds:
   - DN: "/DC=ch/DC=cern/OU=computers/CN=vocms0267.cern.ch"
     fullname: "vocms0267.cern.ch"
\ No newline at end of file
diff --git a/templates/frontend.xml b/templates/frontend.xml
index 80ae3a78468d0766a0972a604b41ad819ca588ec..8f73c0f28ee0b51f8cf93879e0add902933d9159 100644
--- a/templates/frontend.xml
+++ b/templates/frontend.xml
@@ -131,11 +131,13 @@
             </job>
          </match>
          <security idtoken_lifetime="{% if group.idtoken_lifetime is defined %}{{ group.idtoken_lifetime }}{% else %}{{ i.idtoken_lifetime }}{% endif %}">
+            {% if group.credentials is defined %}
             <credentials>
             {% for cred in group.credentials %}
                <credential absfname="{{ cred.absfname }}" security_class="{{ cred.security_class }}" trust_domain="grid" type="{{ cred.type }}"/>
             {% endfor %}
             </credentials>
+            {% endif %}
          </security>
          <attrs>
          {% for attr in group.attrs|default([]) %}