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