diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
index 1b2af53b..ad531084 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubCreator.java
@@ -87,6 +87,7 @@ public class InternalSubCreator extends SubCreator {
                 System.out.println(name + File.separator + "Creator > Loading Template: " + template.getDisplayName());
                 Util.copyDirectory(template.getDirectory(), dir);
                 var.put("name", name);
+                var.put("host", host.getName());
                 var.put("template", template.getName());
                 var.put("type", template.getType().toString().toUpperCase());
                 var.put("version", version.toString());
diff --git a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
index 17556f2b..819d9f81 100644
--- a/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
+++ b/SubServers.Bungee/src/net/ME1312/SubServers/Bungee/Host/Internal/InternalSubServer.java
@@ -121,6 +121,7 @@ public class InternalSubServer extends SubServerContainer {
         try {
             ProcessBuilder pb = new ProcessBuilder().command(Executable.parse(host.getCreator().getBashDirectory(), executable)).directory(directory);
             pb.environment().put("name", getName());
+            pb.environment().put("host", host.getName());
             pb.environment().put("address", host.getAddress().getHostAddress());
             pb.environment().put("port", Integer.toString(getAddress().getPort()));
             process = pb.start();
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java
index 451e3608..83a4683a 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubCreator.java
@@ -232,6 +232,7 @@ public class SubCreator {
                 host.subdata.sendPacket(new PacketOutExLogMessage(address, "Loading Template: " + template.getDisplayName()));
                 Util.copyDirectory(template.getDirectory(), dir);
                 var.put("name", name);
+                if (host.subdata != null) var.put("host", host.subdata.getName());
                 var.put("template", template.getName());
                 var.put("type", template.getType().toString().toUpperCase());
                 var.put("version", version.toString());
diff --git a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java
index 45260531..da8a1183 100644
--- a/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java
+++ b/SubServers.Host/src/net/ME1312/SubServers/Host/Executable/SubServer.java
@@ -110,6 +110,7 @@ public class SubServer {
         try {
             ProcessBuilder pb = new ProcessBuilder().command(Executable.parse(host.host.getRawString("Git-Bash"), executable)).directory(directory);
             pb.environment().put("name", getName());
+            if (host.subdata != null) pb.environment().put("host", host.subdata.getName());
             pb.environment().put("address", host.config.get().getSection("Settings").getRawString("Server-Bind"));
             pb.environment().put("port", Integer.toString(getPort()));
             process = pb.start();