diff --git a/reposync.nomad b/reposync.nomad
index 4a10a77be175e607f11334c65fd7cdb155565edf..eab8bfd2925a008a65283721a4762f4e21bd0483 100644
--- a/reposync.nomad
+++ b/reposync.nomad
@@ -1,4 +1,4 @@
-job "reposync" {
+job "${JOB_PREFIX}reposync" {
   datacenters = ["meyrin"]
 
   type = "batch"
@@ -8,7 +8,7 @@ job "reposync" {
     meta_required = ["PARENT_JOB"]
   }
 
-  task "reposync" {
+  task "${JOB_PREFIX}reposync" {
     driver = "docker"
 
     config {
@@ -17,7 +17,7 @@ job "reposync" {
         type = "gelf"
         config {
           gelf-address = "udp://127.0.0.1:12201"
-          tag = "reposync"
+          tag = "${JOB_PREFIX}reposync"
           env = "NOMAD_JOB_NAME,NOMAD_GROUP_NAME,NOMAD_TASK_NAME,NOMAD_ALLOC_ID,NOMAD_ALLOC_NAME,NOMAD_ALLOC_INDEX,NOMAD_META_PARENT_JOB"
         }
       }
diff --git a/reposync_oneshot.nomad b/reposync_oneshot.nomad
index cd8e992c4ce96053b9d0c3ce8c8ffb31ae045d65..fd8a5a5fced4d33011a76de4d7fa8d45cd888f34 100644
--- a/reposync_oneshot.nomad
+++ b/reposync_oneshot.nomad
@@ -1,4 +1,4 @@
-job "reposync_oneshot" {
+job "${JOB_PREFIX}reposync_oneshot" {
   datacenters = ["meyrin"]
 
   type = "batch"
@@ -7,7 +7,7 @@ job "reposync_oneshot" {
     meta_required = ["repoid"]
   }
 
-  task "reposync_oneshot" {
+  task "${JOB_PREFIX}reposync_oneshot" {
     driver = "docker"
 
     config {
@@ -16,7 +16,7 @@ job "reposync_oneshot" {
         type = "gelf"
         config {
           gelf-address = "udp://127.0.0.1:12201"
-          tag = "reposync_oneshot"
+          tag = "${JOB_PREFIX}reposync_oneshot"
           env = "NOMAD_JOB_NAME,NOMAD_GROUP_NAME,NOMAD_TASK_NAME,NOMAD_ALLOC_ID,NOMAD_ALLOC_NAME,NOMAD_ALLOC_INDEX,NOMAD_META_PARENT_JOB"
         }
       }
diff --git a/reposync_scheduler.nomad b/reposync_scheduler.nomad
index a97089b73077cc89ce4029bec0cf01e84e486977..c126e59ad9fcce9348873043c59d24dab1e8b931 100644
--- a/reposync_scheduler.nomad
+++ b/reposync_scheduler.nomad
@@ -1,16 +1,16 @@
-job "reposync_scheduler" {
+job "${JOB_PREFIX}reposync_scheduler" {
   datacenters = ["meyrin"]
 
   type = "batch"
 
   periodic {
     // Launch every minute
-    cron = "* * * * *"
+    cron = "${SCHEDULE}"
     time_zone = "Europe/Zurich"
     prohibit_overlap = true
   }
 
-  task "reposync_scheduler" {
+  task "${JOB_PREFIX}reposync_scheduler" {
     driver = "docker"
 
     config {
@@ -19,7 +19,7 @@ job "reposync_scheduler" {
         type = "gelf"
         config {
           gelf-address = "udp://127.0.0.1:12201"
-          tag = "reposync_scheduler"
+          tag = "${JOB_PREFIX}reposync_scheduler"
           env = "NOMAD_JOB_NAME,NOMAD_GROUP_NAME,NOMAD_TASK_NAME,NOMAD_ALLOC_ID,NOMAD_ALLOC_NAME,NOMAD_ALLOC_INDEX,NOMAD_META_PARENT_JOB"
         }
       }