diff --git a/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json b/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json
index 07044e87..598e5697 100644
--- a/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json
+++ b/game_eggs/minecraft/bedrock/gomint/egg-go-mint.json
@@ -8,12 +8,15 @@
     "name": "GoMint",
     "author": "parker@parkervcp.com",
     "description": "A performant and stable Minecraft server software for the Bedrock Edition that comes with a modern API and support for Java 11 LTS.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
-        "ghcr.io\/pterodactyl\/yolks:java_11",
         "ghcr.io\/pterodactyl\/yolks:java_8",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java --add-opens java.base\/java.nio=io.netty.common --add-exports java.base\/jdk.internal.misc=io.netty.common -p modules -m gomint.server\/io.gomint.server.Bootstrap",
@@ -31,4 +34,4 @@
         }
     },
     "variables": []
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/airplane/egg-airplane.json b/game_eggs/minecraft/java/airplane/egg-airplane.json
index aa0ca689..14b4d2ef 100644
--- a/game_eggs/minecraft/java/airplane/egg-airplane.json
+++ b/game_eggs/minecraft/java/airplane/egg-airplane.json
@@ -9,10 +9,12 @@
     "author": "info@ttr3.eu",
     "description": "A stable, optimized and fast Paper fork.\r\nhttps:\/\/github.com\/TECHNOVE\/Airplane",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17",
         "ghcr.io\/pterodactyl\/yolks:java_11"
     ],
     "file_denylist": [],
@@ -59,4 +61,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/cuberite/egg-cuberite.json b/game_eggs/minecraft/java/cuberite/egg-cuberite.json
index a99ef76d..ca8c546b 100644
--- a/game_eggs/minecraft/java/cuberite/egg-cuberite.json
+++ b/game_eggs/minecraft/java/cuberite/egg-cuberite.json
@@ -1,14 +1,18 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-12-08T17:25:20-08:00",
+    "exported_at": "2021-11-26T00:05:33+00:00",
     "name": "Cuberite",
     "author": "parker@parkervcp.com",
     "description": "A lightweight, fast and extensible game server for Minecraft",
     "features": null,
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:debian"
+    ],
+    "file_denylist": [],
     "startup": ".\/Cuberite",
     "config": {
         "files": "{\r\n    \"settings.ini\": {\r\n        \"parser\": \"ini\",\r\n        \"find\": {\r\n            \"Server.Ports\": \"{{server.build.default.port}}\",\r\n            \"Server.Description\": \"{{server.build.env.SERV_DESC}}\"\r\n        }\r\n    },\r\n    \"webadmin.ini\": {\r\n        \"parser\": \"ini\",\r\n        \"find\": {\r\n            \"User:admin.Password\": \"{{server.build.env.ADMIN_PASS}}\",\r\n            \"WebAdmin.Ports\": \"{{server.build.env.WEB_PORT}}\"\r\n        }\r\n    }\r\n}",
@@ -18,8 +22,8 @@
     },
     "scripts": {
         "installation": {
-            "script": "#!\/bin\/ash\r\n# Cuberite\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y wget\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/download.cuberite.org\/linux-x86_64\/Cuberite.tar.gz\r\n\r\ntar -xzf Cuberite.tar.gz",
-            "container": "debian:buster-slim",
+            "script": "#!\/bin\/ash\r\n# Cuberite\r\n#\r\n# Server Files: \/mnt\/server\r\napt install -y wget\r\n\r\ncd \/mnt\/server\r\n\r\nwget https:\/\/download.cuberite.org\/linux-x86_64\/Cuberite.tar.gz\r\n\r\ntar -xzf Cuberite.tar.gz",
+            "container": "ghcr.io\/parkervcp\/installers:debian",
             "entrypoint": "bash"
         }
     },
@@ -52,4 +56,4 @@
             "rules": "required|integer|between:1,65535"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/fabric/egg-fabric.json b/game_eggs/minecraft/java/fabric/egg-fabric.json
index 833d0c1f..fe349871 100644
--- a/game_eggs/minecraft/java/fabric/egg-fabric.json
+++ b/game_eggs/minecraft/java/fabric/egg-fabric.json
@@ -9,12 +9,14 @@
     "author": "accounts@bofanodes.io",
     "description": "Fabric is a modular modding toolchain targeting Minecraft 1.14 and above, including snapshots.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
diff --git a/game_eggs/minecraft/java/feather/egg-feather.json b/game_eggs/minecraft/java/feather/egg-feather.json
index 882e525a..d1181ec8 100644
--- a/game_eggs/minecraft/java/feather/egg-feather.json
+++ b/game_eggs/minecraft/java/feather/egg-feather.json
@@ -1,14 +1,18 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-12-12T16:29:02+00:00",
+    "exported_at": "2021-11-26T00:03:20+00:00",
     "name": "Feather",
     "author": "parker@parkervcp.com",
     "description": "An experimental Minecraft server implementation written in Rust.",
     "features": null,
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:debian"
+    ],
+    "file_denylist": [],
     "startup": ".\/feather-server",
     "config": {
         "files": "{\r\n    \"feather.toml\": {\r\n        \"parser\": \"file\",\r\n        \"find\": {\r\n            \"port\": \"port = {{server.build.default.port}}\",\r\n            \"address\": \"address = \\\"0.0.0.0\\\"\"\r\n        }\r\n    }\r\n}",
diff --git a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json
index 00d94e28..50a67d53 100644
--- a/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json
+++ b/game_eggs/minecraft/java/forge/curseforge-generic/egg-curseforge-generic.json
@@ -8,12 +8,15 @@
     "name": "Curseforge Generic",
     "author": "parker@parkervcp.com",
     "description": "A generic egg for a forge modpack",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar server.jar",
@@ -50,4 +53,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json b/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json
index ae3bc611..20d983be 100644
--- a/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json
+++ b/game_eggs/minecraft/java/ftb/egg-ftb-modpacksch-server.json
@@ -8,12 +8,15 @@
     "name": "FTB-modpacks.ch Server",
     "author": "runemaster580@gmail.com",
     "description": "Since the release of the FTB APP, FTB modpacks are now distributed through modpacks.ch. This egg was developed for support for modpacks that are distributed through this.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar forge-server.jar",
@@ -68,4 +71,4 @@
             "rules": "nullable|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/krypton/egg-krypton.json b/game_eggs/minecraft/java/krypton/egg-krypton.json
index 9f5530d0..258262fd 100644
--- a/game_eggs/minecraft/java/krypton/egg-krypton.json
+++ b/game_eggs/minecraft/java/krypton/egg-krypton.json
@@ -8,10 +8,16 @@
   "name": "Krypton",
   "author": "callum.seabrook@prevarinite.com",
   "description": "A fast, lightweight Minecraft server written in Kotlin",
-  "features": null,
+  "features": [
+    "eula",
+    "java_version"
+],
   "images": [
-    "ghcr.io/pterodactyl/yolks:java_16"
-  ],
+    "ghcr.io\/pterodactyl\/yolks:java_8",
+    "ghcr.io\/pterodactyl\/yolks:java_11",
+    "ghcr.io\/pterodactyl\/yolks:java_16",
+    "ghcr.io\/pterodactyl\/yolks:java_17"
+],
   "file_denylist": "",
   "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JAR}}",
   "config": {
diff --git a/game_eggs/minecraft/java/magma/egg-magma.json b/game_eggs/minecraft/java/magma/egg-magma.json
index 79ba9949..879f7eec 100644
--- a/game_eggs/minecraft/java/magma/egg-magma.json
+++ b/game_eggs/minecraft/java/magma/egg-magma.json
@@ -8,12 +8,15 @@
     "name": "Magma",
     "author": "support@pterodactyl.io",
     "description": "Magma is most powerful Forge server providing you with Forge mods and Bukkit Plugins using Spigot and Paper for Performance Optimization and Stability.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
@@ -50,4 +53,4 @@
             "rules": "nullable|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/mohist/egg-mohist.json b/game_eggs/minecraft/java/mohist/egg-mohist.json
index d52b6dc0..d2f5c960 100644
--- a/game_eggs/minecraft/java/mohist/egg-mohist.json
+++ b/game_eggs/minecraft/java/mohist/egg-mohist.json
@@ -8,12 +8,15 @@
     "name": "Mohist",
     "author": "alex.chang-lam@protonmail.com",
     "description": "Spigot fork with performance optimizations.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} pause",
@@ -68,4 +71,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/paper/egg-paper.json b/game_eggs/minecraft/java/paper/egg-paper.json
index ecabd8c5..1ad1196a 100644
--- a/game_eggs/minecraft/java/paper/egg-paper.json
+++ b/game_eggs/minecraft/java/paper/egg-paper.json
@@ -9,13 +9,14 @@
     "author": "parker@pterodactyl.io",
     "description": "High performance Spigot fork that aims to fix gameplay and mechanics inconsistencies.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -70,4 +71,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/purpur/egg-purpur.json b/game_eggs/minecraft/java/purpur/egg-purpur.json
index ff5ef25e..a99db5a0 100644
--- a/game_eggs/minecraft/java/purpur/egg-purpur.json
+++ b/game_eggs/minecraft/java/purpur/egg-purpur.json
@@ -9,12 +9,14 @@
     "author": "purpur@birdflop.com",
     "description": "Fork of Paper and Tuinity providing new configuration options.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
-        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_8"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -60,4 +62,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/spigot/egg-spigot.json b/game_eggs/minecraft/java/spigot/egg-spigot.json
index 2b77191f..54474b96 100644
--- a/game_eggs/minecraft/java/spigot/egg-spigot.json
+++ b/game_eggs/minecraft/java/spigot/egg-spigot.json
@@ -9,12 +9,14 @@
     "author": "support@pterodactyl.io",
     "description": "Spigot is the most widely-used modded Minecraft server software in the world. It powers many of the top Minecraft server networks around to ensure they can cope with their huge player base and ensure the satisfaction of their players. Spigot works by reducing and eliminating many causes of lag, as well as adding in handy features and settings that help make your job of server administration easier.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
@@ -60,4 +62,4 @@
             "rules": "required|string|between:3,7"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json b/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json
index 8628c2ae..8924dba4 100644
--- a/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json
+++ b/game_eggs/minecraft/java/spongeforge/egg-sponge-forge.json
@@ -9,13 +9,14 @@
     "author": "parker@parkervcp.com",
     "description": "A community-driven open source Minecraft: Java Edition modding platform.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
@@ -52,4 +53,4 @@
             "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json b/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json
index f490fd4a..8729d985 100644
--- a/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json
+++ b/game_eggs/minecraft/java/spongevanilla/egg-sponge-vanilla.json
@@ -9,13 +9,14 @@
     "author": "parker@parkervcp.com",
     "description": "SpongeVanilla is the implementation of the Sponge API on top of Vanilla Minecraft.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
@@ -52,4 +53,4 @@
             "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json b/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json
index 04db594d..e0d122d2 100644
--- a/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json
+++ b/game_eggs/minecraft/java/technic/Tekkit/egg-tekkit.json
@@ -8,9 +8,15 @@
     "name": "Tekkit",
     "author": "contact@zennodes.dk",
     "description": "Tekkit is set to reignite the same sort of wonder and awe that we all received from booting up Minecraft for the first time. With the skies open, the moon ready to be colonized (by force if need be) and dimensional mysteries to be plied, with tesseracts to be networked, \u201cmeat\u201d to be processed, items to be digitized, and power suits to be manufactured, there is virtually limitless engineering projects to be assembled.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
-        "quay.io\/pterodactyl\/core:java"
+        "ghcr.io\/pterodactyl\/yolks:java_8",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar Tekkit.jar",
diff --git a/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json b/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json
index abce0996..d7f332be 100644
--- a/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json
+++ b/game_eggs/minecraft/java/technic/tekkit-classic/egg-tekkit-classic.json
@@ -8,9 +8,15 @@
     "name": "Tekkit Classic",
     "author": "geoffrey@remedygaming.net",
     "description": "Created by the Technic team, Tekkit Classic is a modpack for the record breaking sandbox construction game Minecraft. \r\nIt brings together some of the best mods from the Minecraft community for automating, industrializing and powering your worlds and bundles them into one easy download!",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
-        "quay.io\/pterodactyl\/core:java"
+        "ghcr.io\/pterodactyl\/yolks:java_8",
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar Tekkit.jar",
diff --git a/game_eggs/minecraft/java/tuinity/egg-tuinity.json b/game_eggs/minecraft/java/tuinity/egg-tuinity.json
index a598264b..866f95a6 100644
--- a/game_eggs/minecraft/java/tuinity/egg-tuinity.json
+++ b/game_eggs/minecraft/java/tuinity/egg-tuinity.json
@@ -9,13 +9,14 @@
     "author": "unknown@unknown.com",
     "description": "Fork of Paper aimed at improving server performance at high playercounts.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
-        "ghcr.io\/pterodactyl\/yolks:java_11",
         "ghcr.io\/pterodactyl\/yolks:java_8",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -43,4 +44,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json b/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json
index ff17d0b5..eb2ce8b1 100644
--- a/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json
+++ b/game_eggs/minecraft/java/vanillacord/egg-vanilla-cord.json
@@ -9,13 +9,14 @@
     "author": "support@pterodactyl.io",
     "description": "Minecraft is a game about placing blocks and going on adventures. Explore randomly generated worlds and build amazing things from the simplest of homes to the grandest of castles. Play in Creative Mode with unlimited resources or mine deep in Survival Mode, crafting weapons and armor to fend off dangerous mobs. Do all this alone or with friends.\r\n\r\nVanillaCord adds support for BungeeCord's ip_forward setting.",
     "features": [
-        "eula"
+        "eula",
+        "java_version"
     ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
@@ -52,4 +53,4 @@
             "rules": "required|string|between:3,15"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json
index b376474c..2825f7db 100644
--- a/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json
+++ b/game_eggs/minecraft/proxy/bedrock/waterdog_pe/egg-waterdog-p-e.json
@@ -8,11 +8,15 @@
     "name": "Waterdog PE",
     "author": "parker@pterodactyl.io",
     "description": "Brand new proxy server for Minecraft: Bedrock Edition",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Dterminal.ansi=true -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
diff --git a/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json b/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json
index 5bbadf7e..119629cc 100644
--- a/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json
+++ b/game_eggs/minecraft/proxy/cross_platform/waterdog/egg-waterdog.json
@@ -8,12 +8,15 @@
     "name": "Waterdog",
     "author": "parker@pterodactyl.io",
     "description": "Waterdog is fork of the well-known Waterfall, which is a fork of the well-known BungeeCord, server teleportation suite.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",
@@ -50,4 +53,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json
index 5ca1e67e..8e0e431b 100644
--- a/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json
+++ b/game_eggs/minecraft/proxy/java/flamecord/egg-flamecord.json
@@ -8,12 +8,15 @@
     "name": "Flamecord",
     "author": "admin@softwarenoob.com",
     "description": "FlameCord is a patch for Travertine to fix possible exploits and add useful functionalities. FlameCord aims to fix Netty related exploits to keep your server safe from attacks.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
-        "ghcr.io\/pterodactyl\/yolks:java_11",
         "ghcr.io\/pterodactyl\/yolks:java_8",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -50,4 +53,4 @@
             "rules": "required|regex:\/^([\\w\\d._-]+)(\\.jar)$\/"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json b/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json
index 47246c2c..e2e7a1f2 100644
--- a/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json
+++ b/game_eggs/minecraft/proxy/java/travertine/egg-travertine.json
@@ -8,12 +8,15 @@
     "name": "Travertine",
     "author": "parker@parkervcp.com",
     "description": "Travertine is a fork of Waterfall with 1.7 protocol support. Waterfall is a fork of the well-known BungeeCord server teleportation suite.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
-        "ghcr.io\/pterodactyl\/yolks:java_11",
         "ghcr.io\/pterodactyl\/yolks:java_8",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -68,4 +71,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json b/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json
index e19feef8..5695c710 100644
--- a/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json
+++ b/game_eggs/minecraft/proxy/java/typhoonlimbo/egg-typhoon-limbo.json
@@ -1,13 +1,18 @@
 {
     "_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
     "meta": {
-        "version": "PTDL_v1"
+        "version": "PTDL_v1",
+        "update_url": null
     },
-    "exported_at": "2020-06-20T11:37:02-04:00",
+    "exported_at": "2021-11-25T23:59:39+00:00",
     "name": "TyphoonLimbo",
     "author": "parker@parkervcp.com",
     "description": "Lightweight minecraft limbo server",
-    "image": "quay.io\/parkervcp\/pterodactyl-images:base_debian",
+    "features": null,
+    "images": [
+        "ghcr.io\/parkervcp\/yolks:debian"
+    ],
+    "file_denylist": [],
     "startup": "`sleep 2 && .\/TyphoonLimbo`",
     "config": {
         "files": "{\r\n    \"config.json\": {\r\n        \"parser\": \"json\",\r\n        \"find\": {\r\n            \"listen_address\": \":{{server.build.default.port}}\"\r\n        }\r\n    }\r\n}",
@@ -23,4 +28,4 @@
         }
     },
     "variables": []
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json
index 5f9234d1..661ac6e6 100644
--- a/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json
+++ b/game_eggs/minecraft/proxy/java/velocity/egg-velocity.json
@@ -8,13 +8,15 @@
     "name": "Velocity",
     "author": "parker@parkervcp.com",
     "description": "Velocity is a Minecraft server proxy with unparalleled server support, scalability, and flexibility.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
-        "quay.io\/parkervcp\/pterodactyl-images:debian_openjdk-15-hotspot",
         "ghcr.io\/pterodactyl\/yolks:java_8",
         "ghcr.io\/pterodactyl\/yolks:java_11",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar {{SERVER_JARFILE}}",
@@ -51,4 +53,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json
index 48095697..976deac7 100644
--- a/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json
+++ b/game_eggs/minecraft/proxy/java/viaaas/egg-v-i-aaa-s.json
@@ -8,10 +8,15 @@
     "name": "VIAaaS",
     "author": "regulad@outlook.com",
     "description": "VIAaaS - ViaVersion as a Service - Standalone ViaVersion proxy",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
+        "ghcr.io\/pterodactyl\/yolks:java_17",
         "ghcr.io\/pterodactyl\/yolks:java_16",
-        "ghcr.io\/pterodactyl\/yolks:java_17"
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_8"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}} -sslPort={{WEBSERVER_PORT}}",
diff --git a/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json b/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json
index 059ece4c..94597a3d 100644
--- a/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json
+++ b/game_eggs/minecraft/proxy/java/waterfall/egg-waterfall.json
@@ -8,12 +8,15 @@
     "name": "Waterfall",
     "author": "hostmaster@waterfallgaming.net",
     "description": "Waterfall is a fork of the well-known BungeeCord server teleportation suite.",
-    "features": null,
+    "features": [
+        "eula",
+        "java_version"
+    ],
     "images": [
-        "ghcr.io\/pterodactyl\/yolks:java_11",
         "ghcr.io\/pterodactyl\/yolks:java_8",
-        "ghcr.io\/pterodactyl\/yolks:java_14",
-        "ghcr.io\/pterodactyl\/yolks:java_16"
+        "ghcr.io\/pterodactyl\/yolks:java_11",
+        "ghcr.io\/pterodactyl\/yolks:java_16",
+        "ghcr.io\/pterodactyl\/yolks:java_17"
     ],
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -jar {{SERVER_JARFILE}}",
@@ -68,4 +71,4 @@
             "rules": "required|string|max:20"
         }
     ]
-}
\ No newline at end of file
+}