diff --git a/config/nomad/authorizer.nmd.in b/config/nomad/authorizer.nmd.in
index a8c06827f070904beff4543a861089a245eaf968..60fe8253876d0052b151ae550e1b365d015b38dd 100644
--- a/config/nomad/authorizer.nmd.in
+++ b/config/nomad/authorizer.nmd.in
@@ -6,6 +6,12 @@ job "authorizer" {
   group "group" {
     count = 1
 
+    network {
+      port "authorizer" {
+        static = "5007"
+      }
+    }
+
     task "authorizer" {
       driver = "raw_exec"
 
@@ -17,11 +23,6 @@ job "authorizer" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "authorizer" {
-            static = "5007"
-          }
-        }
       }
 
       service {
diff --git a/config/nomad/broker.nmd.in b/config/nomad/broker.nmd.in
index debdc08802983b6b80b84219614f3b908bddb2fc..45fefdecfeea4659c6275f0fce3c24b89d8a09ef 100644
--- a/config/nomad/broker.nmd.in
+++ b/config/nomad/broker.nmd.in
@@ -6,6 +6,11 @@ job "broker" {
   group "group" {
     count = 1
 
+    network {
+      port "broker" {
+      }
+    }
+
     task "broker" {
       driver = "raw_exec"
 
@@ -17,10 +22,6 @@ job "broker" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "broker" {
-          }
-        }
       }
 
       service {
diff --git a/config/nomad/file_transfer.nmd.in b/config/nomad/file_transfer.nmd.in
index 90f1833fef8b7dc1e74e068ab93839862f2af85b..554eb9d004f86ecb5aef8f479aa29e7bca7d491d 100644
--- a/config/nomad/file_transfer.nmd.in
+++ b/config/nomad/file_transfer.nmd.in
@@ -6,6 +6,12 @@ job "file_transfer" {
   group "group" {
     count = 1
 
+    network {
+      port "file_transfer" {
+        static = "5008"
+      }
+    }
+
     task "file_transfer" {
       driver = "raw_exec"
 
@@ -17,11 +23,6 @@ job "file_transfer" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "file_transfer" {
-            static = "5008"
-          }
-        }
       }
 
       service {
diff --git a/config/nomad/monitoring.nmd.in b/config/nomad/monitoring.nmd.in
index e60d814c32698621bacb23e95aa549d57b552c6a..aa8c52fdf95f01a94ddb4d8d1095d014d7bc1e03 100644
--- a/config/nomad/monitoring.nmd.in
+++ b/config/nomad/monitoring.nmd.in
@@ -6,6 +6,12 @@ job "monitoring" {
   group "monitoring" {
     count = 1
 
+    network {
+      port "monitoring_server" {
+        static = "5009"
+      }
+    }
+
     task "monitoring-server" {
       driver = "raw_exec"
 
@@ -17,11 +23,6 @@ job "monitoring" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "monitoring_server" {
-            static = "5009"
-          }
-        }
       }
 
       service {
diff --git a/config/nomad/receiver_fabric.nmd.in b/config/nomad/receiver_fabric.nmd.in
index a37759b5f33653f858d1a961ccb3e6ea569c4133..058e5ffeadeced14ba280a5dd0a5474a73180760 100644
--- a/config/nomad/receiver_fabric.nmd.in
+++ b/config/nomad/receiver_fabric.nmd.in
@@ -6,6 +6,12 @@ job "receiver" {
   group "group" {
     count = 1
 
+    network {
+      port "recv" {}
+      port "recv_ds" {}
+      port "recv_metrics" {}
+    }
+
     task "receiver" {
       driver = "raw_exec"
 
@@ -17,11 +23,6 @@ job "receiver" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "recv" {}
-          port "recv_ds" {}
-          port "recv_metrics" {}
-        }
       }
 
       service {
diff --git a/config/nomad/receiver_kafka.nmd.in b/config/nomad/receiver_kafka.nmd.in
index 6b1047d39dfdb3be4db58dbb568fdf0f6bda3e02..1d736d213115da10287f89407a82476826462249 100644
--- a/config/nomad/receiver_kafka.nmd.in
+++ b/config/nomad/receiver_kafka.nmd.in
@@ -10,6 +10,12 @@ job "receiver" {
   group "group" {
     count = 1
 
+    network {
+      port "recv" {}
+      port "recv_ds" {}
+      port "recv_metrics" {}
+    }
+
     task "receiver" {
       driver = "raw_exec"
 
@@ -21,11 +27,6 @@ job "receiver" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "recv" {}
-          port "recv_ds" {}
-          port "recv_metrics" {}
-        }
       }
 
       service {
diff --git a/config/nomad/receiver_tcp.nmd.in b/config/nomad/receiver_tcp.nmd.in
index dcf9f9176917df2090e72be2185128b3b76e7bfb..b24b121106017a01e9f25c2fb55f2aeec74b4b8d 100644
--- a/config/nomad/receiver_tcp.nmd.in
+++ b/config/nomad/receiver_tcp.nmd.in
@@ -6,6 +6,12 @@ job "receiver" {
   group "group" {
     count = 1
 
+    network {
+      port "recv" {}
+      port "recv_ds" {}
+      port "recv_metrics" {}
+    }
+
     task "receiver" {
       driver = "raw_exec"
 
@@ -17,11 +23,6 @@ job "receiver" {
       resources {
         cpu    = 50 # 50 MHz
         memory = 256 # 256MB
-        network {
-          port "recv" {}
-          port "recv_ds" {}
-          port "recv_metrics" {}
-        }
       }
 
       service {