diff --git a/minecraft-bungeecord/minecraft-bungeecord.json b/minecraft-bungeecord/minecraft-bungeecord.json
index 4b9f15cb..395c928d 100644
--- a/minecraft-bungeecord/minecraft-bungeecord.json
+++ b/minecraft-bungeecord/minecraft-bungeecord.json
@@ -36,7 +36,7 @@
   },
   "install": [
     {
-      "if": "!in_path('java')",
+      "if": "env == 'host'",
       "type": "javadl",
       "version": "17"
     },
@@ -53,8 +53,8 @@
   "run": {
     "command": [
       {
-        "command": "java17 -Xmx${memory}M -Xms${memory}M -Dlog4j2.formatMsgNoLookups=true -jar BungeeCord.jar",
-        "if": "in_path('java17')"
+        "if": "env == 'host'",
+        "command": "java17 -Xmx${memory}M -Xms${memory}M -Dlog4j2.formatMsgNoLookups=true -jar BungeeCord.jar"
       },
       {
         "command": "java -Xmx${memory}M -Xms${memory}M -Dlog4j2.formatMsgNoLookups=true -jar BungeeCord.jar"
diff --git a/minecraft-ftb-117+/README.md b/minecraft-ftb-117+/README.md
deleted file mode 100644
index 7985b50e..00000000
--- a/minecraft-ftb-117+/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Feed The Beast for Forge 1.17+ - Minecraft Template
-
-Updated for the new forge server installation method
-
-A modpack id and version id is needed to download the installer. It can be found by selecting the preferred modpack in the [modpack list](https://www.feed-the-beast.com/modpack). The modpack id is then shown next to the modpack title and the version id is found under the versions tab. 
-A Forge version (without spaces) is needed to download/install the server. May be located [here](http://files.minecraftforge.net)
-
-E.g. FTB Inferno for Minecraft 1.18.2  
-Modpack ID: "99"
-Version ID: "2267"
-Forge 1.18.2 version (no spaces): "1.18.2-40.1.80"
diff --git a/minecraft-ftb-117+/data.txt b/minecraft-ftb-117+/data.txt
deleted file mode 100644
index 3c103d75..00000000
--- a/minecraft-ftb-117+/data.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-modpack_id=100
-modpack_version=2298
-version=1.18.2-40.1.84
\ No newline at end of file
diff --git a/minecraft-ftb-117+/minecraft-ftb-117+-docker.json b/minecraft-ftb-117+/minecraft-ftb-117+-docker.json
deleted file mode 100644
index d72e2e99..00000000
--- a/minecraft-ftb-117+/minecraft-ftb-117+-docker.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "type": "minecraft-java",
-  "display": "FTB - Forge 1.17+ (Docker)",
-  "data": {
-    "eula": {
-      "type": "boolean",
-      "desc": "Do you (or the server owner) agree to the <a href='https://account.mojang.com/documents/minecraft_eula'>Minecraft EULA?</a>",
-      "display": "EULA Agreement",
-      "required": true,
-      "value": "false"
-    },
-    "ip": {
-      "type": "string",
-      "desc": "What IP to bind the server to",
-      "display": "IP",
-      "required": true,
-      "value": "0.0.0.0"
-    },
-    "java": {
-      "type": "string",
-      "desc": "\"java\" for system standard, else direct path to java",
-      "display": "path to java executable",
-      "required": true,
-      "value": "java",
-      "userEdit": true
-    },
-    "memory": {
-      "type": "integer",
-      "desc": "How much memory in MB to allocate to the Java Heap",
-      "display": "Memory (MB)",
-      "required": true,
-      "value": "3072"
-    },
-    "modpack_id": {
-      "type": "integer",
-      "desc": "Get the modpack ID for your preffered modpack in the <a href='https://www.feed-the-beast.com/modpack' target='_blank'>Modpacklist</a>.",
-      "display": "Modpack ID",
-      "required": true,
-      "value": "",
-      "userEdit": true
-    },
-    "modpack_version": {
-      "type": "integer",
-      "desc": "Version ID from the versions tab of the selected modpack in the <a href='https://www.feed-the-beast.com/modpack' target='_blank'>Modpacklist</a>.",
-      "display": "Modpack version ID",
-      "required": true,
-      "value": "",
-      "userEdit": true
-    },
-    "motd": {
-      "type": "string",
-      "desc": "This is the message that is displayed in the server list of the client, below the name. The MOTD does support <a href='https://minecraft.gamepedia.com/Formatting_codes' target='_blank'>color and formatting codes</a>.",
-      "display": "MOTD message of the day",
-      "required": true,
-      "value": "A Minecraft Server hosted on PufferPanel"
-    },
-    "port": {
-      "type": "integer",
-      "desc": "What port to bind the server to",
-      "display": "Port",
-      "required": true,
-      "value": "25565"
-    },
-    "version": {
-      "type": "string",
-      "desc": "Version of Forge to install with no spaces (may be located <a href='http://files.minecraftforge.net/'>here</a>",
-      "display": "Version",
-      "required": true,
-      "value": ""
-    }
-  },
-  "install": [
-    {
-      "files": [
-        "https://api.modpacks.ch/public/modpack/${modpack_id}/${modpack_version}/server/linux"
-      ],
-      "type": "download"
-    },
-    {
-      "commands": [
-        "chmod u+x linux",
-        "./linux ${modpack_id} ${modpack_version} --auto --noscript"
-      ],
-      "type": "command"
-    },
-    {
-      "source": "forge-*.jar",
-      "target": "ForgeServer.jar",
-      "type": "move"
-    },
-    {
-      "target": "eula.txt",
-      "text": "eula=${eula}",
-      "type": "writefile"
-    },
-    {
-      "target": "server.properties",
-      "text": "server-ip=${ip}\nserver-port=${port}\nmotd=${motd}\n",
-      "type": "writefile"
-    },
-    {
-      "commands": [
-        "java -jar forge-*-installer.jar --installServer"
-      ],
-      "type": "command"
-    }
-  ],
-  "run": {
-    "command": "java -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -Dlog4j2.formatMsgNoLookups=true -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true @libraries/net/minecraftforge/forge/${version}/unix_args.txt nogui",
-    "stop": "stop"
-  },
-  "environment": {
-    "type": "docker",
-    "image": "eclipse-temurin:17"
-  },
-  "requirements": {
-    "os": "linux",
-    "arch": "amd64"
-  }
-}
diff --git a/minecraft-ftb-117+/minecraft-ftb-117+.json b/minecraft-ftb-117+/minecraft-ftb-117+.json
deleted file mode 100644
index a4ba35ba..00000000
--- a/minecraft-ftb-117+/minecraft-ftb-117+.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-  "type": "minecraft-java",
-  "display": "FTB - Forge 1.17+",
-  "data": {
-    "eula": {
-      "type": "boolean",
-      "desc": "Do you (or the server owner) agree to the <a href='https://account.mojang.com/documents/minecraft_eula'>Minecraft EULA?</a>",
-      "display": "EULA Agreement",
-      "required": true,
-      "value": "false"
-    },
-    "ip": {
-      "type": "string",
-      "desc": "What IP to bind the server to",
-      "display": "IP",
-      "required": true,
-      "value": "0.0.0.0"
-    },
-    "java": {
-      "type": "string",
-      "desc": "\"java\" for system standard, else direct path to java",
-      "display": "path to java executable",
-      "required": true,
-      "value": "java",
-      "userEdit": true
-    },
-    "memory": {
-      "type": "integer",
-      "desc": "How much memory in MB to allocate to the Java Heap",
-      "display": "Memory (MB)",
-      "required": true,
-      "value": "3072"
-    },
-    "modpack_id": {
-      "type": "integer",
-      "desc": "Get the modpack ID for your preffered modpack in the <a href='https://www.feed-the-beast.com/modpack' target='_blank'>Modpacklist</a>.",
-      "display": "Modpack ID",
-      "required": true,
-      "value": "",
-      "userEdit": true
-    },
-    "modpack_version": {
-      "type": "integer",
-      "desc": "Version ID from the versions tab of the selected modpack in the <a href='https://www.feed-the-beast.com/modpack' target='_blank'>Modpacklist</a>.",
-      "display": "Modpack version ID",
-      "required": true,
-      "value": "",
-      "userEdit": true
-    },
-    "motd": {
-      "type": "string",
-      "desc": "This is the message that is displayed in the server list of the client, below the name. The MOTD does support <a href='https://minecraft.gamepedia.com/Formatting_codes' target='_blank'>color and formatting codes</a>.",
-      "display": "MOTD message of the day",
-      "required": true,
-      "value": "A Minecraft Server hosted on PufferPanel"
-    },
-    "port": {
-      "type": "integer",
-      "desc": "What port to bind the server to",
-      "display": "Port",
-      "required": true,
-      "value": "25565"
-    },
-    "version": {
-      "type": "string",
-      "desc": "Version of Forge to install with no spaces (may be located <a href='http://files.minecraftforge.net/'>here</a>",
-      "display": "Version",
-      "required": true,
-      "value": ""
-    }
-  },
-  "install": [
-    {
-      "type": "javadl",
-      "version": "17"
-    },
-    {
-      "files": [
-        "https://api.modpacks.ch/public/modpack/${modpack_id}/${modpack_version}/server/linux"
-      ],
-      "type": "download"
-    },
-    {
-      "commands": [
-        "chmod u+x linux",
-        "./linux ${modpack_id} ${modpack_version} --auto --noscript"
-      ],
-      "type": "command"
-    },
-    {
-      "source": "forge-*.jar",
-      "target": "ForgeServer.jar",
-      "type": "move"
-    },
-    {
-      "target": "eula.txt",
-      "text": "eula=${eula}",
-      "type": "writefile"
-    },
-    {
-      "target": "server.properties",
-      "text": "server-ip=${ip}\nserver-port=${port}\nmotd=${motd}\n",
-      "type": "writefile"
-    },
-    {
-      "commands": [
-        "java17 -jar forge-1.1*.*-installer.jar --installServer"
-      ],
-      "type": "command"
-    }
-  ],
-  "run": {
-    "command": "java17 -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -Dlog4j2.formatMsgNoLookups=true -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true @libraries/net/minecraftforge/forge/${version}/unix_args.txt nogui",
-    "stop": "stop"
-  },
-  "environment": {
-    "type": "host"
-  },
-  "requirements": {
-    "os": "linux",
-    "arch": "amd64"
-  }
-}
diff --git a/minecraft-ftb/README.md b/minecraft-ftb/README.md
index c64ed75c..fc36e3f8 100644
--- a/minecraft-ftb/README.md
+++ b/minecraft-ftb/README.md
@@ -6,4 +6,3 @@ A modpack id and version id is needed to download the installer. It can be found
 
 E.g. FTB Revelation 3.3.0 has the modpack id 35 and version id 143 
 
-Please see the [original forum post](https://community.pufferpanel.com/topic/671/mooded-minecraft-feed-the-beast) contributed by themaxaut and descention for more information (regarding the older version of the template and install process).
diff --git a/minecraft-ftb/minecraft-ftb-docker.json b/minecraft-ftb/minecraft-ftb-docker.json
deleted file mode 100644
index 20345a03..00000000
--- a/minecraft-ftb/minecraft-ftb-docker.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "type": "minecraft-java",
-  "display": "FTB - Minecraft (Legacy) (Docker)",
-  "data": {
-    "eula": {
-      "value": "false",
-      "required": true,
-      "desc": "Do you (or the server owner) agree to the <a href='https://account.mojang.com/documents/minecraft_eula'>Minecraft EULA?</a>",
-      "display": "EULA Agreement",
-      "internal": false,
-      "type": "boolean"
-    },
-    "ip": {
-      "value": "0.0.0.0",
-      "required": true,
-      "desc": "What IP to bind the server to",
-      "display": "IP",
-      "internal": false
-    },
-    "port": {
-      "value": "25565",
-      "required": true,
-      "desc": "What port to bind the server to",
-      "display": "Port",
-      "internal": false,
-      "type": "integer"
-    },
-    "motd": {
-      "value": "A Minecraft Server hosted on PufferPanel",
-      "required": true,
-      "desc": "This is the message that is displayed in the server list of the client, below the name. The MOTD does support <a href='https://minecraft.gamepedia.com/Formatting_codes' target='_blank'>color and formatting codes</a>.",
-      "display": "MOTD message of the day",
-      "internal": false
-    },
-    "modpack_id": {
-      "desc": "Get the modpack ID for your preffered modpack in the <a href='https://www.feed-the-beast.com/modpack' target='_blank'>Modpacklist</a>.",
-      "display": "Modpack ID",
-      "required": true,
-      "value": "",
-      "userEdit": true,
-      "type": "integer"
-    },
-    "modpack_version": {
-      "desc": "Version ID from the versions tab of the selected modpack in the <a href='https://www.feed-the-beast.com/modpack' target='_blank'>Modpacklist</a>.",
-      "display": "Modpack version ID",
-      "required": true,
-      "value": "",
-      "userEdit": true,
-      "type": "integer"
-    },
-    "memory": {
-      "value": "4096",
-      "required": true,
-      "desc": "How much memory in MB to allocate to the Java Heap",
-      "display": "Memory (MB)",
-      "internal": false,
-      "type": "integer"
-    }
-  },
-  "install": [
-    {
-      "type": "download",
-      "files": "https://api.modpacks.ch/public/modpack/${modpack_id}/${modpack_version}/server/linux"
-    },
-    {
-      "type": "command",
-      "commands": [
-        "chmod u+x linux",
-        "./linux ${modpack_id} ${modpack_version} --auto --noscript"
-      ]
-    },
-    {
-      "type": "move",
-      "source": "forge-*.jar",
-      "target": "ForgeServer.jar"
-    },
-    {
-      "type": "writefile",
-      "text": "eula=${eula}",
-      "target": "eula.txt"
-    },
-    {
-      "type": "writefile",
-      "text": "server-ip=${ip}\nserver-port=${port}\nmotd=${motd}\n",
-      "target": "server.properties"
-    }
-  ],
-  "run": {
-    "command": "java -server -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -Dlog4j2.formatMsgNoLookups=true -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true -jar ForgeServer.jar nogui",
-    "stop": "stop"
-  },
-  "environment": {
-    "type": "docker",
-    "image": "eclipse-temurin:8"
-  },
-  "requirements": {
-    "os": "linux",
-    "arch": "amd64"
-  }
-}
diff --git a/minecraft-ftb/minecraft-ftb.json b/minecraft-ftb/minecraft-ftb.json
index 3fed5d01..ec11ee28 100644
--- a/minecraft-ftb/minecraft-ftb.json
+++ b/minecraft-ftb/minecraft-ftb.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft-java",
-  "display": "FTB - Minecraft (Legacy)",
+  "display": "Minecraft - FTB Modpack",
   "data": {
     "eula": {
       "value": "false",
@@ -62,10 +62,18 @@
       "display": "Java Version",
       "desc": "Version of Java to use",
       "type": "integer"
+    },
+    "version": {
+      "type": "string",
+      "desc": "Version of Forge that is shipped with the modpack with no spaces (may be located <a href='http://files.minecraftforge.net/'>here</a>",
+      "display": "Version",
+      "required": true,
+      "value": ""
     }
   },
   "install": [
     {
+      "if": "env == 'host'",
       "type": "javadl",
       "version": "${javaversion}"
     },
@@ -81,9 +89,10 @@
       ]
     },
     {
+      "if": "version == ''",
       "type": "move",
       "source": "forge-*.jar",
-      "target": "ForgeServer.jar"
+      "target": "server.jar"
     },
     {
       "type": "writefile",
@@ -97,14 +106,39 @@
     }
   ],
   "run": {
-    "command": "java${javaversion} -server -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -Dlog4j2.formatMsgNoLookups=true -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true -jar ForgeServer.jar nogui",
+    "command": [
+      {
+        "if": "os == 'windows' && file_exists('libraries/net/minecraftforge/forge/' + version + '/win_args.txt')",
+        "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true @libraries/net/minecraftforge/forge/${version}/win_args.txt nogui"
+      },
+      {
+        "if": "file_exists('libraries/net/minecraftforge/forge/' + version + '/unix_args.txt')",
+        "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true @libraries/net/minecraftforge/forge/${version}/unix_args.txt nogui"
+      },
+      {
+        "if": "env == 'host'",
+        "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar server.jar"
+      },
+      {
+        "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar server.jar"
+      }
+    ],
     "stop": "stop"
   },
   "environment": {
     "type": "host"
   },
+  "supportedEnvironments": [
+    {
+      "type": "host"
+    },
+    {
+      "type": "docker",
+      "image": "eclipse-temurin:${javaversion}"
+    }
+  ],
   "requirements": {
     "os": "linux",
     "arch": "amd64"
   }
-}
+}
\ No newline at end of file
diff --git a/minecraft-velocity/minecraft-velocity-docker.json b/minecraft-velocity/minecraft-velocity-docker.json
deleted file mode 100644
index 2ffaad85..00000000
--- a/minecraft-velocity/minecraft-velocity-docker.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-  "type": "minecraft-java",
-  "display": "Velocity - Minecraft (Docker)",
-  "data": {
-    "version": {
-      "type": "string",
-      "desc": "Version of Velocity to install.",
-      "display": "Velocity Version",
-      "required": true,
-      "value": "3.1.2-SNAPSHOT",
-      "userEdit": true
-    },
-    "build": {
-      "type": "integer",
-      "desc": "Build of the Velocity Version to use",
-      "display": "Velocity Build",
-      "required": true,
-      "value": "195",
-      "userEdit": true
-    },
-    "ip": {
-      "type": "string",
-      "desc": "What IP to bind the server to",
-      "display": "IP",
-      "required": true,
-      "value": "0.0.0.0"
-    },
-    "memory": {
-      "type": "integer",
-      "desc": "How much memory in MB to allocate to the Waterfall server. It is generally recommended to allocated 512MB RAM for every 500 players. Please keep in mind that additional plugins may impact the amount needed in your case.",
-      "display": "Memory (MB)",
-      "required": true,
-      "value": 512
-    },
-    "motd": {
-      "type": "string",
-      "desc": "This is the message that is displayed in the server list of the client, below the name. The MOTD does support <a href='https://minecraft.gamepedia.com/Formatting_codes' target='_blank'>color and formatting codes</a>.",
-      "display": "MOTD message of the day",
-      "required": true,
-      "value": "A Velocity proxy &9hosted on PufferPanel"
-    },
-    "port": {
-      "type": "integer",
-      "desc": "What port to bind the server to",
-      "display": "Port",
-      "required": true,
-      "value": "25565"
-    }
-  },
-  "install": [
-    {
-      "files": [
-        "https://api.papermc.io/v2/projects/velocity/versions/${version}/builds/${build}/downloads/velocity-${version}-${build}.jar"
-      ],
-      "type": "download"
-    },
-    {
-      "source": "velocity-*.jar",
-      "target": "velocity.jar",
-      "type": "move"
-    }
-  ],
-  "run": {
-    "command": "java -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar velocity.jar",
-    "stop": "shutdown"
-  },
-  "environment": {
-    "type": "docker",
-    "image": "eclipse-temurin:17"
-  }
-}
diff --git a/minecraft-velocity/minecraft-velocity.json b/minecraft-velocity/minecraft-velocity.json
index ba015b29..ddd7d0dc 100644
--- a/minecraft-velocity/minecraft-velocity.json
+++ b/minecraft-velocity/minecraft-velocity.json
@@ -37,7 +37,8 @@
       "desc": "This is the message that is displayed in the server list of the client, below the name. The MOTD does support <a href='https://minecraft.gamepedia.com/Formatting_codes' target='_blank'>color and formatting codes</a>.",
       "display": "MOTD message of the day",
       "required": true,
-      "value": "A Velocity proxy &9hosted on PufferPanel"
+      "value": "A Velocity proxy &9hosted on PufferPanel",
+      "userEdit": true
     },
     "port": {
       "type": "integer",
@@ -49,6 +50,7 @@
   },
   "install": [
     {
+      "if": "env == 'host'",
       "type": "javadl",
       "version": "17"
     },
@@ -65,10 +67,27 @@
     }
   ],
   "run": {
-    "command": "java17 -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar velocity.jar",
+    "command": [
+      {
+        "if": "env == 'host'",
+        "command": "java17 -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar velocity.jar"
+      },
+      {
+        "command": "java -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar velocity.jar"
+      }
+    ],
     "stop": "shutdown"
   },
   "environment": {
     "type": "host"
-  }
-}
+  },
+  "supportedEnvironments": [
+    {
+      "type": "host"
+    },
+    {
+      "type": "docker",
+      "image": "eclipse-temurin:17"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/minecraft-waterfall/minecraft-waterfall-docker.json b/minecraft-waterfall/minecraft-waterfall-docker.json
deleted file mode 100644
index cf9d4fe8..00000000
--- a/minecraft-waterfall/minecraft-waterfall-docker.json
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  "type": "minecraft-java",
-  "display": "Waterfall - Minecraft (Docker)",
-  "data": {
-    "build": {
-      "type": "string",
-      "desc": "Build number",
-      "display": "build",
-      "required": true,
-      "value": "510"
-    },
-    "ip": {
-      "type": "string",
-      "desc": "What IP to bind the server to",
-      "display": "IP",
-      "required": true,
-      "value": "0.0.0.0"
-    },
-    "memory": {
-      "type": "integer",
-      "desc": "How much memory in MB to allocate to the Waterfall server. It is generally recommended to allocated 512MB RAM for every 500 players. Please keep in mind that additional plugins may impact the amount needed in your case.",
-      "display": "Memory (MB)",
-      "required": true,
-      "value": "512"
-    },
-    "motd": {
-      "type": "string",
-      "desc": "This is the message that is displayed in the server list of the client, below the name. The MOTD does support <a href='https://minecraft.gamepedia.com/Formatting_codes' target='_blank'>color and formatting codes</a>.",
-      "display": "MOTD message of the day",
-      "required": true,
-      "value": "A Waterfall Server &9hosted on PufferPanel"
-    },
-    "port": {
-      "type": "integer",
-      "desc": "What port to bind the server to",
-      "display": "Port",
-      "required": true,
-      "value": "25577"
-    },
-    "version": {
-      "type": "string",
-      "desc": "Version of Minecraft to install. Must be specified as a <strong>minor release number</strong>, e.g. 1.16",
-      "display": "Version",
-      "required": true,
-      "value": "1.19"
-    }
-  },
-  "install": [
-    {
-      "files": [
-        "https://api.papermc.io/v2/projects/waterfall/versions/${version}/builds/${build}/downloads/waterfall-${version}-${build}.jar"
-      ],
-      "type": "download"
-    },
-    {
-      "source": "waterfall-*.jar",
-      "target": "Waterfall.jar",
-      "type": "move"
-    },
-    {
-      "target": "config.yml",
-      "text": "listeners:\n- query_port: ${port}\n  host: ${ip}:${port}\n  motd: '${motd}'\n",
-      "type": "writefile"
-    }
-  ],
-  "run": {
-    "command": "java -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar Waterfall.jar",
-    "stop": "end"
-  },
-  "environment": {
-    "type": "docker",
-    "image": "eclipse-temurin:17"
-  }
-}
diff --git a/minecraft-waterfall/minecraft-waterfall.json b/minecraft-waterfall/minecraft-waterfall.json
index 42f3482a..39821cea 100644
--- a/minecraft-waterfall/minecraft-waterfall.json
+++ b/minecraft-waterfall/minecraft-waterfall.json
@@ -1,6 +1,6 @@
 {
   "type": "minecraft-java",
-  "display": "Waterfall - Minecraft",
+  "display": "Minecraft - Waterfall",
   "data": {
     "build": {
       "type": "string",
@@ -47,6 +47,7 @@
   },
   "install": [
     {
+      "if": "env == 'host'",
       "type": "javadl",
       "version": "17"
     },
@@ -68,10 +69,18 @@
     }
   ],
   "run": {
-    "command": "java17 -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar Waterfall.jar",
+    "command": [
+      {
+        "if": "env == 'host'",
+        "command": "java17 -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar Waterfall.jar"
+      },
+      {
+        "command": "java -Xmx${memory}M -Xms${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar Waterfall.jar"
+      }
+    ],
     "stop": "end"
   },
   "environment": {
     "type": "host"
   }
-}
+}
\ No newline at end of file
diff --git a/minecraft/minecraft.json b/minecraft/minecraft.json
index 486adf7d..c034fd3e 100644
--- a/minecraft/minecraft.json
+++ b/minecraft/minecraft.json
@@ -333,8 +333,8 @@
         "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true @libraries/net/minecraftforge/forge/${version}/unix_args.txt nogui"
       },
       {
-        "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar server.jar",
-        "if": "env == 'host'"
+        "if": "env == 'host'",
+        "command": "java${javaversion} -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar server.jar"
       },
       {
         "command": "java -Xmx${memory}M -Dterminal.jline=false -Dterminal.ansi=true -Dlog4j2.formatMsgNoLookups=true -jar server.jar"