diff --git a/reposync.nomad b/reposync.nomad
index 630db663f43382f8f0801f05b173769f010f3303..8d551fddeb41ce2386bc6231e0de859fb66829dd 100644
--- a/reposync.nomad
+++ b/reposync.nomad
@@ -17,6 +17,7 @@ job "reposync" {
         config {
           gelf-address = "udp://127.0.0.1:12201"
           tag = "reposync"
+          env-regex = "NOMAD_(\w+_NAME|ALLOC_I\w+|META_\w+)"
         }
       }
       volumes = [
diff --git a/reposync/runreposync.sh b/reposync/runreposync.sh
index 8b19f3cb45659b31c5c7b1acf19dfad4dcd29fd1..674ae62d89d1f85f7360eea89fbbd27b831af45a 100755
--- a/reposync/runreposync.sh
+++ b/reposync/runreposync.sh
@@ -6,10 +6,6 @@ OUTPUT='/alloc/output.json'
 log () {
 cat << EOF | tr -d '\n'
 {
-  "NOMAD_JOB_NAME": "${NOMAD_JOB_NAME}",
-  "NOMAD_GROUP_NAME": "${NOMAD_GROUP_NAME}",
-  "NOMAD_TASK_NAME": "${NOMAD_TASK_NAME}",
-  "NOMAD_ALLOC_ID": "${NOMAD_ALLOC_ID}",
   "PARENT_JOB": "${PARENT_JOB}",
   "repoid": "${REPOID}",
   $@
diff --git a/reposync_oneshot.nomad b/reposync_oneshot.nomad
index de224a121a088aac75b96b59df83fe9f75b1a38d..d2cb6f060a77d9ab3bd6dc5f0139456d07e20b8d 100644
--- a/reposync_oneshot.nomad
+++ b/reposync_oneshot.nomad
@@ -17,6 +17,7 @@ job "reposync_oneshot" {
         config {
           gelf-address = "udp://127.0.0.1:12201"
           tag = "reposync_oneshot"
+          env-regex = "NOMAD_(\w+_NAME|ALLOC_I\w+|META_\w+)"
         }
       }
     }
diff --git a/reposync_scheduler.nomad b/reposync_scheduler.nomad
index f9160bf64e7fc89ca4b522628e23897391867a9a..1195bb1727b9b804a50b4e6e0f0dd4b7016085ec 100644
--- a/reposync_scheduler.nomad
+++ b/reposync_scheduler.nomad
@@ -20,6 +20,7 @@ job "reposync_scheduler" {
         config {
           gelf-address = "udp://127.0.0.1:12201"
           tag = "reposync_scheduler"
+          env-regex = "NOMAD_(\w+_NAME|ALLOC_I\w+|META_\w+)"
         }
       }
     }
diff --git a/scheduler/schedule.py b/scheduler/schedule.py
index 0bd8ad3f0038ef5d32b7bbd6795f051ea720aa52..88d742b3c86c1a4c19f59bde6ce3de9087185cb0 100755
--- a/scheduler/schedule.py
+++ b/scheduler/schedule.py
@@ -18,13 +18,6 @@ STATUS_CHECK_SECS = 5
 REPOID = os.getenv('NOMAD_META_REPOID', None)
 
 def log(**kwargs):
-    kwargs.update({
-        'NOMAD_JOB_NAME'  : os.getenv('NOMAD_JOB_NAME',   None),
-        'NOMAD_GROUP_NAME': os.getenv('NOMAD_GROUP_NAME', None),
-        'NOMAD_TASK_NAME' : os.getenv('NOMAD_TASK_NAME',  None),
-        'NOMAD_ALLOC_ID'  : os.getenv('NOMAD_ALLOC_ID',   None),
-    })
-
     print(json.dumps(kwargs))
 
 def debug(**kwargs):