diff --git a/jobs/games/minecraft.hcl b/jobs/games/minecraft.hcl
deleted file mode 100644
index e715f69..0000000
--- a/jobs/games/minecraft.hcl
+++ /dev/null
@@ -1,279 +0,0 @@
-job "minecraft" {
-  datacenters = ["aperture"]
-  type = "service"
-
-  group "vanilla-mc" {
-    count = 1
-
-    network {
-      port "mc-vanilla-port" {
-        static = 25567
-        to = 25565
-      }
-      port "mc-vanilla-rcon" {
-        to = 25575
-      }
-    }
-
-    service {
-      name = "vanilla-mc"
-    }
-
-    task "minecraft-vanilla" {
-      driver = "docker"
-      config {
-        image = "itzg/minecraft-server"
-        ports = ["mc-vanilla-port","mc-vanilla-rcon"]
-        volumes = [
-          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
-        ]
-      }
-
-      resources {
-        cpu    = 3000 # 3000 MHz
-        memory = 8192 # 8GB
-      }
-
-      env {
-        EULA = "TRUE"
-        TYPE = "PAPER"
-        ICON = "https://docs.redbrick.dcu.ie/assets/logo.png"
-        USE_AIKAR_FLAGS=true
-        MOTD = "LONG LIVE THE REDBRICK"
-        MAX_PLAYERS = "20"
-      }
-    }
-  }
-
-  group "fugitives-mc" {
-    count = 1
-
-    network {
-      port "mc-fugitives-port" {
-        static = 25570
-        to = 25565
-      }
-      port "mc-fugitives-rcon" {
-        to = 25575
-      }
-    }
-
-    service {
-      name = "fugitives-mc"
-    }
-
-    task "minecraft-fugitives" {
-      driver = "docker"
-      config {
-        image = "itzg/minecraft-server"
-        ports = ["mc-fugitives-port","mc-fugitives-rcon"]
-        volumes = [
-          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
-        ]
-      }
-
-      resources {
-        cpu    = 3000 # 3000 MHz
-        memory = 8192 # 8GB
-      }
-
-      env {
-        EULA = "TRUE"
-        TYPE = "PAPER"
-        USE_AIKAR_FLAGS=true
-        MOTD = "Fugitives"
-        MAX_PLAYERS = "20"
-        MEMORY = "6G"
-      }
-    }
-  }
-
-  group "games-mc" {
-    count = 1
-
-    network {
-      port "mc-games-port" {
-        static = 25569
-        to = 25565
-      }
-
-      port "mc-games-rcon" {
-        to = 25575
-      }
-    }
-
-    service {
-      name = "games-mc"
-    }
-
-    task "minecraft-games" {
-      driver = "docker"
-
-      config {
-        image = "itzg/minecraft-server"
-        ports = ["mc-games-port","mc-games-rcon"]
-
-        volumes = [
-          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
-        ]
-      }
-
-      resources {
-        cpu    = 3000 # 3000 MHz
-        memory = 8192 # 8GB
-      }
-
-      env {
-        EULA = "TRUE"
-        TYPE = "PURPUR"
-        VERSION = "1.20.1"
-        MOTD = "DCU Games Soc Minecraft Server"
-        USE_AIKAR_FLAGS=true
-        OPS = ""
-        MAX_PLAYERS = "20"
-      }
-    }
-  }
-  group "olim909-mc" {
-    count = 1
-
-    network {
-      port "mc-olim909-port" {
-        static = 25568
-        to = 25565
-      }
-
-      port "mc-olim909-rcon" {
-        to = 25575
-      }
-      port "mc-olim909-geyser" {
-        to = 19132
-      }
-    }
-
-    service {
-      name = "olim909-mc"
-    }
-
-    task "minecraft-olim909" {
-      driver = "docker"
-
-      config {
-        image = "itzg/minecraft-server"
-        ports = ["mc-olim909-port","mc-olim909-rcon","mc-olim909-geyser"]
-
-        volumes = [
-          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
-        ]
-      }
-
-      resources {
-        cpu    = 3000 # 3000 MHz
-        memory = 4096 # 4GB
-      }
-
-      env {
-        EULA = "TRUE"
-        TYPE = "PAPER"
-        VERSION = "1.20.4"
-        USE_AIKAR_FLAGS=true
-        OPS = "Olim909"
-        MAX_PLAYERS = "5"
-      }
-    }
-  }
-
-  group "regaus-mc" {
-    count = 1
-
-    network {
-      port "mc-regaus-port" {
-        static = 25566
-        to = 25565
-      }
-
-      port "mc-regaus-rcon" {
-        to = 25575
-      }
-    }
-
-    service {
-      name = "regaus-mc"
-    }
-
-    task "minecraft-regaus" {
-      driver = "docker"
-
-      config {
-        image = "itzg/minecraft-server"
-        ports = ["mc-regaus-port","mc-regaus-rcon"]
-
-        volumes = [
-          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
-        ]
-      }
-
-      resources {
-        cpu    = 3000 # 3000 MHz
-        memory = 4096 # 4GB
-      }
-
-      env {
-        EULA = "TRUE"
-        TYPE = "PAPER"
-        VERSION = "1.20.4"
-        USE_AIKAR_FLAGS=true
-        OPS = "regaus"
-        MAX_PLAYERS = "5"
-      }
-    }
-  }
-
-  group "cjaran-mc" {
-    count = 1
-
-    network {
-      port "mc-cjaran-port" {
-        static = 25571
-        to = 25565
-      }
-
-      port "mc-cjaran-rcon" {
-        to = 25575
-      }
-    }
-
-    service {
-      name = "cjaran-mc"
-    }
-
-    task "minecraft-cjaran" {
-      driver = "docker"
-
-      config {
-        image = "itzg/minecraft-server"
-        ports = ["mc-cjaran-port","mc-cjaran-rcon"]
-
-        volumes = [
-          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
-        ]
-      }
-
-      resources {
-        cpu    = 3000 # 3000 MHz
-        memory = 4096 # 4GB
-      }
-
-      env {
-        EULA = "TRUE"
-        TYPE = "PAPER"
-        ICON = "https://i.imgur.com/HC9cRNf.png"
-        VERSION = "1.20.4"
-        USE_AIKAR_FLAGS=true
-        OPS = "BloThen"
-        MAX_PLAYERS = "10"
-      }
-    }
-  }
-}
-
diff --git a/jobs/games/minecraft/cjaran.hcl b/jobs/games/minecraft/cjaran.hcl
new file mode 100644
index 0000000..547ae04
--- /dev/null
+++ b/jobs/games/minecraft/cjaran.hcl
@@ -0,0 +1,51 @@
+job "minecraft-cjaran" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  group "cjaran-mc" {
+    count = 1
+
+    network {
+      port "mc" {
+        static = 25571
+        to     = 25565
+      }
+
+      port "rcon" {
+        to = 25575
+      }
+    }
+
+    service {
+      name = "cjaran-mc"
+      port = "mc"
+    }
+
+    task "minecraft-cjaran" {
+      driver = "docker"
+
+      config {
+        image = "itzg/minecraft-server"
+        ports = ["mc", "rcon"]
+
+        volumes = [
+          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
+        ]
+      }
+
+      resources {
+        cpu    = 3000 # 3000 MHz
+        memory = 4096 # 4GB
+      }
+
+      env {
+        EULA            = "TRUE"
+        TYPE            = "PAPER"
+        VERSION         = "1.20.4"
+        USE_AIKAR_FLAGS = true
+        OPS             = "BloThen"
+        MAX_PLAYERS     = "10"
+      }
+    }
+  }
+}
diff --git a/jobs/games/minecraft/fugitives.hcl b/jobs/games/minecraft/fugitives.hcl
new file mode 100644
index 0000000..d7c1a49
--- /dev/null
+++ b/jobs/games/minecraft/fugitives.hcl
@@ -0,0 +1,48 @@
+job "minecraft-fugitives" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  group "fugitives-mc" {
+    count = 1
+
+    network {
+      port "mc" {
+        static = 25570
+        to     = 25565
+      }
+      port "rcon" {
+        to = 25575
+      }
+    }
+
+    service {
+      name = "fugitives-mc"
+      port = "mc"
+    }
+
+    task "minecraft-fugitives" {
+      driver = "docker"
+      config {
+        image = "itzg/minecraft-server"
+        ports = ["mc", "rcon"]
+        volumes = [
+          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
+        ]
+      }
+
+      resources {
+        cpu    = 3000 # 3000 MHz
+        memory = 8192 # 8GB
+      }
+
+      env {
+        EULA            = "TRUE"
+        TYPE            = "PAPER"
+        USE_AIKAR_FLAGS = true
+        MOTD            = "Fugitives"
+        MAX_PLAYERS     = "20"
+        MEMORY          = "6G"
+      }
+    }
+  }
+}
diff --git a/jobs/games/minecraft/games.hcl b/jobs/games/minecraft/games.hcl
new file mode 100644
index 0000000..c74784a
--- /dev/null
+++ b/jobs/games/minecraft/games.hcl
@@ -0,0 +1,52 @@
+job "minecraft-games" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  group "games-mc" {
+    count = 1
+
+    network {
+      port "mc" {
+        static = 25569
+        to     = 25565
+      }
+
+      port "rcon" {
+        to = 25575
+      }
+    }
+
+    service {
+      name = "games-mc"
+      port = "mc"
+    }
+
+    task "minecraft-games" {
+      driver = "docker"
+
+      config {
+        image = "itzg/minecraft-server"
+        ports = ["mc", "rcon"]
+
+        volumes = [
+          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
+        ]
+      }
+
+      resources {
+        cpu    = 3000 # 3000 MHz
+        memory = 8192 # 8GB
+      }
+
+      env {
+        EULA            = "TRUE"
+        TYPE            = "PURPUR"
+        VERSION         = "1.20.1"
+        MOTD            = "DCU Games Soc Minecraft Server"
+        USE_AIKAR_FLAGS = true
+        OPS             = ""
+        MAX_PLAYERS     = "20"
+      }
+    }
+  }
+}
diff --git a/jobs/games/minecraft/magma.hcl b/jobs/games/minecraft/magma.hcl
index 335108c..4d8b84b 100644
--- a/jobs/games/minecraft/magma.hcl
+++ b/jobs/games/minecraft/magma.hcl
@@ -6,28 +6,38 @@ job "minecraft-magma" {
     count = 1
 
     network {
-      port "minecraft" {
+      port "mc" {
         static = 25572
         to     = 25565
       }
       port "rcon" {
         to = 25575
       }
-      port "voicechat" {
+      port "voice" {
         to = 24454
       }
     }
 
     service {
-      name = "minecraft-magma"
-      port = "minecraft"
+      name = "magma-mc"
+      port = "mc"
+    }
+
+    service {
+      name = "magma-mc-rcon"
+      port = "rcon"
+    }
+
+    service {
+      name = "magma-mc-voice"
+      port = "voice"
     }
 
     task "minecraft-magma" {
       driver = "docker"
       config {
         image = "itzg/minecraft-server:java17-alpine"
-        ports = ["minecraft", "rcon", "voicechat"]
+        ports = ["mc", "rcon", "voice"]
         volumes = [
           "/storage/nomad/${NOMAD_TASK_NAME}:/data"
         ]
diff --git a/jobs/games/minecraft/olim909.hcl b/jobs/games/minecraft/olim909.hcl
new file mode 100644
index 0000000..88b2e08
--- /dev/null
+++ b/jobs/games/minecraft/olim909.hcl
@@ -0,0 +1,54 @@
+job "minecraft-olim909" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  group "olim909-mc" {
+    count = 1
+
+    network {
+      port "mc" {
+        static = 25568
+        to     = 25565
+      }
+
+      port "rcon" {
+        to = 25575
+      }
+      port "geyser" {
+        to = 19132
+      }
+    }
+
+    service {
+      name = "olim909-mc"
+      port = "mc"
+    }
+
+    task "minecraft-olim909" {
+      driver = "docker"
+
+      config {
+        image = "itzg/minecraft-server"
+        ports = ["mc", "rcon", "geyser"]
+
+        volumes = [
+          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
+        ]
+      }
+
+      resources {
+        cpu    = 3000 # 3000 MHz
+        memory = 4096 # 4GB
+      }
+
+      env {
+        EULA            = "TRUE"
+        TYPE            = "PAPER"
+        VERSION         = "1.20.4"
+        USE_AIKAR_FLAGS = true
+        OPS             = "Olim909"
+        MAX_PLAYERS     = "5"
+      }
+    }
+  }
+}
diff --git a/jobs/games/minecraft/regaus.hcl b/jobs/games/minecraft/regaus.hcl
new file mode 100644
index 0000000..56f8868
--- /dev/null
+++ b/jobs/games/minecraft/regaus.hcl
@@ -0,0 +1,51 @@
+job "minecraft-regaus" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  group "regaus-mc" {
+    count = 1
+
+    network {
+      port "mc" {
+        static = 25566
+        to     = 25565
+      }
+
+      port "rcon" {
+        to = 25575
+      }
+    }
+
+    service {
+      name = "regaus-mc"
+      port = "mc"
+    }
+
+    task "minecraft-regaus" {
+      driver = "docker"
+
+      config {
+        image = "itzg/minecraft-server"
+        ports = ["mc", "rcon"]
+
+        volumes = [
+          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
+        ]
+      }
+
+      resources {
+        cpu    = 3000 # 3000 MHz
+        memory = 4096 # 4GB
+      }
+
+      env {
+        EULA            = "TRUE"
+        TYPE            = "PAPER"
+        VERSION         = "1.20.4"
+        USE_AIKAR_FLAGS = true
+        OPS             = "regaus"
+        MAX_PLAYERS     = "5"
+      }
+    }
+  }
+}
diff --git a/jobs/games/minecraft/vanilla.hcl b/jobs/games/minecraft/vanilla.hcl
new file mode 100644
index 0000000..3ebc770
--- /dev/null
+++ b/jobs/games/minecraft/vanilla.hcl
@@ -0,0 +1,53 @@
+job "minecraft-vanilla" {
+  datacenters = ["aperture"]
+  type        = "service"
+
+  group "vanilla-mc" {
+    count = 1
+
+    network {
+      port "mc" {
+        static = 25567
+        to     = 25565
+      }
+      port "rcon" {
+        to = 25575
+      }
+    }
+
+    service {
+      name = "vanilla-mc"
+      port = "mc"
+    }
+
+    service {
+      name = "vanilla-mc-rcon"
+      port = "rcon"
+    }
+
+    task "minecraft-vanilla" {
+      driver = "docker"
+      config {
+        image = "itzg/minecraft-server"
+        ports = ["mc", "rcon"]
+        volumes = [
+          "/storage/nomad/${NOMAD_TASK_NAME}:/data"
+        ]
+      }
+
+      resources {
+        cpu    = 3000 # 3000 MHz
+        memory = 8192 # 8GB
+      }
+
+      env {
+        EULA            = "TRUE"
+        TYPE            = "PAPER"
+        ICON            = "https://docs.redbrick.dcu.ie/assets/logo.png"
+        USE_AIKAR_FLAGS = true
+        MOTD            = "LONG LIVE THE REDBRICK"
+        MAX_PLAYERS     = "20"
+      }
+    }
+  }
+}