diff --git a/jobs/games/minecraft/cjaran.hcl b/jobs/games/minecraft/cjaran.hcl
index 547ae04..8189368 100644
--- a/jobs/games/minecraft/cjaran.hcl
+++ b/jobs/games/minecraft/cjaran.hcl
@@ -7,7 +7,6 @@ job "minecraft-cjaran" {
 
     network {
       port "mc" {
-        static = 25571
         to     = 25565
       }
 
@@ -21,6 +20,11 @@ job "minecraft-cjaran" {
       port = "mc"
     }
 
+    service {
+      name = "cjaran-mc-rcon"
+      port = "rcon"
+    }
+
     task "minecraft-cjaran" {
       driver = "docker"
 
diff --git a/jobs/games/minecraft/fugitives.hcl b/jobs/games/minecraft/fugitives.hcl
index d7c1a49..2a1f7a8 100644
--- a/jobs/games/minecraft/fugitives.hcl
+++ b/jobs/games/minecraft/fugitives.hcl
@@ -7,7 +7,6 @@ job "minecraft-fugitives" {
 
     network {
       port "mc" {
-        static = 25570
         to     = 25565
       }
       port "rcon" {
@@ -20,6 +19,11 @@ job "minecraft-fugitives" {
       port = "mc"
     }
 
+    service {
+      name = "fugitives-mc-rcon"
+      port = "rcon"
+    }
+
     task "minecraft-fugitives" {
       driver = "docker"
       config {
diff --git a/jobs/games/minecraft/games.hcl b/jobs/games/minecraft/games.hcl
index c74784a..2a7189b 100644
--- a/jobs/games/minecraft/games.hcl
+++ b/jobs/games/minecraft/games.hcl
@@ -7,8 +7,7 @@ job "minecraft-games" {
 
     network {
       port "mc" {
-        static = 25569
-        to     = 25565
+        to = 25565
       }
 
       port "rcon" {
@@ -21,6 +20,11 @@ job "minecraft-games" {
       port = "mc"
     }
 
+    service {
+      name = "games-mc-rcon"
+      port = "rcon"
+    }
+
     task "minecraft-games" {
       driver = "docker"
 
diff --git a/jobs/games/minecraft/magma.hcl b/jobs/games/minecraft/magma.hcl
index 4d8b84b..ee837ba 100644
--- a/jobs/games/minecraft/magma.hcl
+++ b/jobs/games/minecraft/magma.hcl
@@ -7,15 +7,17 @@ job "minecraft-magma" {
 
     network {
       port "mc" {
-        static = 25572
-        to     = 25565
-      }
-      port "rcon" {
-        to = 25575
+        to = 25565
       }
+      port "rcon" {}
       port "voice" {
-        to = 24454
+        to = 4503
+        static = 4503
       }
+      port "rcon-ssh" {
+        to = 2222
+      }
+      port "rcon-web" {}
     }
 
     service {
@@ -31,6 +33,12 @@ job "minecraft-magma" {
     service {
       name = "magma-mc-voice"
       port = "voice"
+      tags = [
+        "traefik.enable=true",
+        "traefik.tcp.routers.magma-mc-voice.rule=HostSNI(`magma-mc.rb.dcu.ie`)",
+        "traefik.tcp.routers.magma-mc-voice.tls.passthrough=true",
+        "traefik.udp.routers.magma-mc-voice.entrypoints=voice-udp",
+      ]
     }
 
     task "minecraft-magma" {
@@ -48,15 +56,39 @@ job "minecraft-magma" {
         memory = 10240 # 10GB
       }
 
-      env {
-        EULA            = "TRUE"
-        TYPE            = "FABRIC"
-        VERSION         = "1.20.4"
-        ICON            = "https://raw.githubusercontent.com/redbrick/design-system/main/assets/logos/logo.png"
-        MEMORY          = "8G"
-        USE_AIKAR_FLAGS = true
-        JVM_XX_OPTS     = "-XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32"
+      template {
+        data        = <<EOF
+EULA            = "TRUE"
+TYPE            = "FABRIC"
+VERSION         = "1.20.4"
+ICON            = "https://raw.githubusercontent.com/redbrick/design-system/main/assets/logos/logo.png"
+MEMORY          = "8G"
+USE_AIKAR_FLAGS = true
+JVM_XX_OPTS     = "-XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32"
+ENABLE_RCON=true
+RCON_PASSWORD="habibi"
+RCON_PORT={{ env "NOMAD_PORT_rcon" }}
+EOF
+        destination = "local/.env"
+        env         = true
       }
     }
+
+    task "rcon-hub" {
+      driver = "docker"
+      config {
+      image = "itzg/rcon-hub"
+      ports = ["rcon-ssh"]
+      }
+      template {
+        data = <<EOF
+RH_USER=testing
+RH_PASSWORD=pw
+RH_CONNECTION="mc={{ env "NOMAD_HOST_IP_rcon"}}@mc:{{ env "NOMAD_PORT_rcon" }}"
+EOF
+        destination = "local/.env"
+        env         = true
+    }
+    }
   }
 }
diff --git a/jobs/games/minecraft/olim909.hcl b/jobs/games/minecraft/olim909.hcl
index 88b2e08..fd40c92 100644
--- a/jobs/games/minecraft/olim909.hcl
+++ b/jobs/games/minecraft/olim909.hcl
@@ -7,7 +7,6 @@ job "minecraft-olim909" {
 
     network {
       port "mc" {
-        static = 25568
         to     = 25565
       }
 
@@ -24,6 +23,11 @@ job "minecraft-olim909" {
       port = "mc"
     }
 
+    service {
+      name = "olim909-mc-rcon"
+      port = "rcon"
+    }
+
     task "minecraft-olim909" {
       driver = "docker"
 
diff --git a/jobs/games/minecraft/regaus.hcl b/jobs/games/minecraft/regaus.hcl
index 56f8868..d3f89f3 100644
--- a/jobs/games/minecraft/regaus.hcl
+++ b/jobs/games/minecraft/regaus.hcl
@@ -7,7 +7,6 @@ job "minecraft-regaus" {
 
     network {
       port "mc" {
-        static = 25566
         to     = 25565
       }
 
diff --git a/jobs/games/minecraft/vanilla.hcl b/jobs/games/minecraft/vanilla.hcl
index 3ebc770..c1dc283 100644
--- a/jobs/games/minecraft/vanilla.hcl
+++ b/jobs/games/minecraft/vanilla.hcl
@@ -7,7 +7,6 @@ job "minecraft-vanilla" {
 
     network {
       port "mc" {
-        static = 25567
         to     = 25565
       }
       port "rcon" {