diff --git a/.github/workflows/pages-gh.yml b/.github/workflows/pages-gh.yml
index 6fc5f43..96ab436 100644
--- a/.github/workflows/pages-gh.yml
+++ b/.github/workflows/pages-gh.yml
@@ -373,6 +373,7 @@ jobs:
         # __USERNAME__="${{ secrets.GITLAB_CONTAINER_USERNAME }}" \
         # __PASSWORD__="${{ secrets.GITLAB_CONTAINER_TOKEN }}" \
         # __REGISTRY__="${{ secrets.NOMAD_SERVER_DATACENTERS }}" \
+        __RESEARCHER__:  "${{ secrets.__RESEARCHER__ }}"
 
     steps:
       - name: Prepare Environment
@@ -408,8 +409,8 @@ jobs:
              __IMAGE_FORCE_PULL__="${{ env.FORCE_PULL || 'false' }}" \
              __DATACENTERS__="${{ env.NOMAD_SERVER_DATACENTERS }}" \
              __NAMESPACE__="${{ env.NOMAD_SERVER_NAMESPACE }}" \
-             envsubst < nomad/template.hcl > ${{ env.SERVICE }}.hcl
-             cat ${{ env.SERVICE }}.hcl
+             envsubst < nomad/template.nomad > ${{ env.SERVICE }}.nomad
+             cat ${{ env.SERVICE }}.nomad
 
       - name: Deploy TIMESTAMPED Website To Nomad
         run: NOMAD_TOKEN=${{ secrets.NOMAD_SERVER_TOKEN }} NOMAD_ADDR=${{ secrets.NOMAD_SERVER_ADDRESS }} nomad job run ${{ env.SERVICE }}.hcl
diff --git a/nomad/template.hcl b/nomad/template.nomad
similarity index 80%
rename from nomad/template.hcl
rename to nomad/template.nomad
index 79f7acf..3be3cb4 100644
--- a/nomad/template.hcl
+++ b/nomad/template.nomad
@@ -65,12 +65,8 @@ job "${__SERVICE__}-${__ENVIRONMENT__}" {
         "traefik.http.routers.rcg-${__SERVICE__}-${__ENVIRONMENT__}.tls=true",
         "traefik.http.routers.rcg-${__SERVICE__}-${__ENVIRONMENT__}.entrypoints=websecure",
         
-        "traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputing.ca`)",
-        "traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}-nossl.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputing.ca`)",
-        "traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.tls=true",
-
-        "traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputinggroup.ca`)",
-        "traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}-nossl.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.ruthjoy.researchcomputinggroup.ca`)",
+        "traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.${__RESEARCHER__}.researchcomputinggroup.ca`)",
+        "traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}-nossl.rule=Host(`${__SERVICE__}-${__ENVIRONMENT__}.${__RESEARCHER__}.researchcomputinggroup.ca`)",
         "traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.tls=true",
         "traefik.http.routers.researchcomputinggroup-${__SERVICE__}-${__ENVIRONMENT__}.entrypoints=websecure",
       ]