diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed647b1ea9ad5e506e29d2766e8c1f21f7726394..67e5775827beb63417b81044b13ec0e40009e28c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ TBD
 ### Bug fixes
 - Bedrock Builder | Utilize self call instead of static call for unzipping bedrock archives ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/884))
 - Fix Human Readable Sizes on Dashboard ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/885))
+- Correct Builder to support new Neoforge versioning scheme ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/886))
 ### Tweaks
 TBD
 ### Lang
diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index a45b2acb01b5e4c35657f1f48d8e60c0ba3617a1..3d98072cf935aa42ddbae2d75c6c50f0d51d8679 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -577,7 +577,7 @@ class Controller:
         if data["create_type"] == "minecraft_java":
             if root_create_data["create_type"] == "download_jar":
                 # modded update urls from server jars will only update the installer
-                if create_data["type"] != "forge-installer":
+                if create_data["type"] not in MODDED_TYPES:
                     server_obj = self.servers.get_server_obj(new_server_id)
                     url = self.big_bucket.get_fetch_url(
                         create_data["category"],
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 6ec504fe710361d38a6eddf3fab9dd88a31d6ff8..21d580157107adacb7870d3045310d70e39733f0 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -775,14 +775,15 @@ class ServerInstance:
                         # We get the server command parameters from forge script
                         server_command = re.findall(
                             r"java @([a-zA-Z0-9_\.]+)"
-                            r" @([a-z.\/\-]+)([0-9.\-]+)"
-                            r"\/\b([a-z_0-9]+\.txt)\b( .{2,4})?",
+                            r" @([a-z./\-]+)"
+                            r"([0-9.\-]+(?:-[a-zA-Z0-9]+)?)"
+                            r"\/\b([a-z_0-9]+\.txt)\b"
+                            r"( .{2,4})?",
                             run_file_text,
                         )[0]
 
                         version = server_command[2]
                         executable_path = f"{server_command[1]}{server_command[2]}/"
-
                         # Let's set the proper server executable
                         server_obj.executable = os.path.join(
                             f"{executable_path}{version_info[0][0]}-{version}-server.jar"