diff --git a/templates/application/mappingfile-prod.json.erb b/templates/application/mappingfile-prod.json.erb
index b188884..958b4ab 100644
--- a/templates/application/mappingfile-prod.json.erb
+++ b/templates/application/mappingfile-prod.json.erb
@@ -1,58 +1,58 @@
 {
-  "/antagning.se$/": "antagning.drive.sunet.se",
-  "/bth.se$/": "bth.drive.sunet.se",
-  "/chalmers.se$/": "chalmers.drive.sunet.se",
-  "/du.se$/": "du.drive.sunet.se",
-  "/eduid.se$/": "extern.drive.sunet.se",
-  "/esh.se$/": "esh.drive.sunet.se",
-  "/fhs.se$/": "fhs.drive.sunet.se",
-  "/gih.se$/": "gih.drive.sunet.se",
-  "/gu.se$/": "gu.drive.sunet.se",
-  "/hb.se$/": "hb.drive.sunet.se",
-  "/@shh.se$/": "shh.drive.sunet.se",
-  "/@hh.se$/": "hh.drive.sunet.se",
-  "/hhs.se$/": "hhs.drive.sunet.se",
-  "/hig.se$/": "hig.drive.sunet.se",
-  "/his.se$/": "his.drive.sunet.se",
-  "/hj.se$/": "hj.drive.sunet.se",
-  "/hkr.se$/": "hkr.drive.sunet.se",
-  "/hv.se$/": "hv.drive.sunet.se",
-  "/irf.se$/": "irf.drive.sunet.se",
-  "/kb.se$/": "kb.drive.sunet.se",
-  "/ki.se$/": "ki.drive.sunet.se",
-  "/kkh.se$/": "kkh.drive.sunet.se",
-  "/kmh.se$/": "kmh.drive.sunet.se",
-  "/konstfack.se$/": "konstfack.drive.sunet.se",
-  "/kth.se$/": "kth.drive.sunet.se",
-  "/kva.se$/": "kva.drive.sunet.se",
-  "/liu.se$/": "liu.drive.sunet.se",
-  "/lnu.se$/": "lnu.drive.sunet.se",
-  "/ltu.se$/": "ltu.drive.sunet.se",
-  "/lu.se$/": "lu.drive.sunet.se",
-  "/mah.se$/": "mau.drive.sunet.se",
-  "/mau.se$/": "mau.drive.sunet.se",
-  "/mdh.se$/": "mdu.drive.sunet.se",
-  "/mdu.se$/": "mdu.drive.sunet.se",
-  "/miun.se$/": "miun.drive.sunet.se",
-  "/nordunet.se$/": "nordunet.drive.sunet.se",
-  "/nordu.net$/": "nordunet.drive.sunet.se",
-  "/nrm.se$/": "nrm.drive.sunet.se",
-  "/oru.se$/": "oru.drive.sunet.se",
-  "/rkh.se$/": "rkh.drive.sunet.se",
-  "/sics.se$/": "sics.drive.sunet.se",
-  "/slu.se$/": "slu.drive.sunet.se",
-  "/smhi.se$/": "smhi.drive.sunet.se",
-  "/sp.se$/": "sp.drive.sunet.se",
-  "/su.se$/": "su.drive.sunet.se",
-  "/sunet.se$/": "sunet.drive.sunet.se",
-  "/suni.se$/": "suni.drive.sunet.se",
-  "/swamid.se$/": "swamid.drive.sunet.se",
-  "/ths.se$/": "ths.drive.sunet.se",
-  "/uhr.se$/": "uhr.drive.sunet.se",
-  "/umu.se$/": "umu.drive.sunet.se",
-  "/uniarts.se$/": "uniarts.drive.sunet.se",
-  "/uu.se$/": "uu.drive.sunet.se",
-  "/vinnova.se$/": "vinnova.drive.sunet.se",
-  "/vr.se$/": "vr.drive.sunet.se",
+  "/@(\\w+\\.)*antagning.se$/": "antagning.drive.sunet.se",
+  "/@(\\w+\\.)*bth.se$/": "bth.drive.sunet.se",
+  "/@(\\w+\\.)*chalmers.se$/": "chalmers.drive.sunet.se",
+  "/@(\\w+\\.)*du.se$/": "du.drive.sunet.se",
+  "/@(\\w+\\.)*eduid.se$/": "extern.drive.sunet.se",
+  "/@(\\w+\\.)*esh.se$/": "esh.drive.sunet.se",
+  "/@(\\w+\\.)*fhs.se$/": "fhs.drive.sunet.se",
+  "/@(\\w+\\.)*gih.se$/": "gih.drive.sunet.se",
+  "/@(\\w+\\.)*gu.se$/": "gu.drive.sunet.se",
+  "/@(\\w+\\.)*hb.se$/": "hb.drive.sunet.se",
+  "/@(\\w+\\.)*shh.se$/": "shh.drive.sunet.se",
+  "/@(\\w+\\.)*hh.se$/": "hh.drive.sunet.se",
+  "/@(\\w+\\.)*hhs.se$/": "hhs.drive.sunet.se",
+  "/@(\\w+\\.)*hig.se$/": "hig.drive.sunet.se",
+  "/@(\\w+\\.)*his.se$/": "his.drive.sunet.se",
+  "/@(\\w+\\.)*hj.se$/": "hj.drive.sunet.se",
+  "/@(\\w+\\.)*hkr.se$/": "hkr.drive.sunet.se",
+  "/@(\\w+\\.)*hv.se$/": "hv.drive.sunet.se",
+  "/@(\\w+\\.)*irf.se$/": "irf.drive.sunet.se",
+  "/@(\\w+\\.)*kb.se$/": "kb.drive.sunet.se",
+  "/@(\\w+\\.)*ki.se$/": "ki.drive.sunet.se",
+  "/@(\\w+\\.)*kkh.se$/": "kkh.drive.sunet.se",
+  "/@(\\w+\\.)*kmh.se$/": "kmh.drive.sunet.se",
+  "/@(\\w+\\.)*konstfack.se$/": "konstfack.drive.sunet.se",
+  "/@(\\w+\\.)*kth.se$/": "kth.drive.sunet.se",
+  "/@(\\w+\\.)*kva.se$/": "kva.drive.sunet.se",
+  "/@(\\w+\\.)*liu.se$/": "liu.drive.sunet.se",
+  "/@(\\w+\\.)*lnu.se$/": "lnu.drive.sunet.se",
+  "/@(\\w+\\.)*ltu.se$/": "ltu.drive.sunet.se",
+  "/@(\\w+\\.)*lu.se$/": "lu.drive.sunet.se",
+  "/@(\\w+\\.)*mah.se$/": "mau.drive.sunet.se",
+  "/@(\\w+\\.)*mau.se$/": "mau.drive.sunet.se",
+  "/@(\\w+\\.)*mdh.se$/": "mdu.drive.sunet.se",
+  "/@(\\w+\\.)*mdu.se$/": "mdu.drive.sunet.se",
+  "/@(\\w+\\.)*miun.se$/": "miun.drive.sunet.se",
+  "/@(\\w+\\.)*nordunet.se$/": "nordunet.drive.sunet.se",
+  "/@(\\w+\\.)*nordu.net$/": "nordunet.drive.sunet.se",
+  "/@(\\w+\\.)*nrm.se$/": "nrm.drive.sunet.se",
+  "/@(\\w+\\.)*oru.se$/": "oru.drive.sunet.se",
+  "/@(\\w+\\.)*rkh.se$/": "rkh.drive.sunet.se",
+  "/@(\\w+\\.)*sics.se$/": "sics.drive.sunet.se",
+  "/@(\\w+\\.)*slu.se$/": "slu.drive.sunet.se",
+  "/@(\\w+\\.)*smhi.se$/": "smhi.drive.sunet.se",
+  "/@(\\w+\\.)*sp.se$/": "sp.drive.sunet.se",
+  "/@(\\w+\\.)*su.se$/": "su.drive.sunet.se",
+  "/@(\\w+\\.)*sunet.se$/": "sunet.drive.sunet.se",
+  "/@(\\w+\\.)*suni.se$/": "suni.drive.sunet.se",
+  "/@(\\w+\\.)*swamid.se$/": "swamid.drive.sunet.se",
+  "/@(\\w+\\.)*ths.se$/": "ths.drive.sunet.se",
+  "/@(\\w+\\.)*uhr.se$/": "uhr.drive.sunet.se",
+  "/@(\\w+\\.)*umu.se$/": "umu.drive.sunet.se",
+  "/@(\\w+\\.)*uniarts.se$/": "uniarts.drive.sunet.se",
+  "/@(\\w+\\.)*uu.se$/": "uu.drive.sunet.se",
+  "/@(\\w+\\.)*vinnova.se$/": "vinnova.drive.sunet.se",
+  "/@(\\w+\\.)*vr.se$/": "vr.drive.sunet.se",
   "/$/": "extern.drive.sunet.se"
 }