diff --git a/Makefile b/.devcontainer/Makefile
similarity index 93%
rename from Makefile
rename to .devcontainer/Makefile
index 062296e51..65bda74af 100644
--- a/Makefile
+++ b/.devcontainer/Makefile
@@ -6,28 +6,6 @@
 # in game, stop loot spam #logs set gmsay 69 0
 NAME := eqemu-server
 
-is-vscode:
-	@if [ -z "$$REMOTE_CONTAINERS" ]; then \
-		echo "Not running in VS Code devcontainer"; \
-		exit 1; \
-	fi
-
-.PHONY: build
-build: is-vscode
-	@cd patch && make patch --no-print-directory
-	cd build$$BUILD_SUFFIX && cmake --build . --config Release --target all --
-
-.PHONY: cmake
-cmake: is-vscode
-	@echo "working directory: $$PWD"
-	mkdir -p build$$BUILD_SUFFIX
-	@cd build$$BUILD_SUFFIX && cmake -DEQEMU_BUILD_LOGIN=ON \
-			-DEQEMU_BUILD_TESTS=ON \
-			-DCMAKE_CXX_COMPILER_LAUNCHER=ccache -G Ninja ..
-
-clean: is-vscode
-	rm -rf build
-
 .PHONY: prep
 prep: is-vscode
 	@echo "Preparing build/bin for usage..."
@@ -73,6 +51,15 @@ prep: is-vscode
 
 	@echo "Eqemu is prepared. Edit build/bin/eqemu_config.json to configure."
 
+is-vscode:
+	@if [ -z "$$REMOTE_CONTAINERS" ]; then \
+		echo "Not running in VS Code devcontainer"; \
+		exit 1; \
+	fi
+
+clean: is-vscode
+	rm -rf build
+
 .PHONY: maps
 maps: is-vscode
 	@echo "Downloading maps..."
@@ -104,7 +91,7 @@ shared: is-vscode check-mariadb
 # Runs zone binary
 .PHONY: zone
 zone: is-vscode check-mariadb
-	@-rm build/bin/logs/zone/zone*.log
+	@find build/bin/logs/zone/ -type f -name 'zone*.log' -exec rm -f {} +
 	cd build/bin && ./zone
 
 check-mariadb: is-vscode
@@ -115,19 +102,19 @@ check-mariadb: is-vscode
 # Runs world binary
 .PHONY: world
 world: is-vscode check-mariadb
-	@-rm build/bin/logs/world*.log
+	@find build/bin/logs/ -type f -name 'world*.log' -exec rm -f {} +
 	cd build/bin && ./world
 
 # Runs ucs binary
 .PHONY: ucs
 ucs: is-vscode check-mariadb
-	@-rm build/bin/logs/ucs*.log
+	@find build/bin/logs/ -type f -name 'ucs*.log' -exec rm -f {} +
 	cd build/bin && ./ucs
 
 # Runs queryserv binary
 .PHONY: queryserv
 queryserv: is-vscode check-mariadb
-	@-rm build/bin/logs/query_server*.log
+	@find build/bin/logs/ -type f -name 'query_server*.log' -exec rm -f {} +
 	cd build/bin && ./queryserv
 
 reset-content:
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index d6ccc7265..90ec8234c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -40,10 +40,41 @@
 				"GitHub.copilot",
 				"xackery.make-magic",
 				"Gruntfuggly.todo-tree",
-				"ms-vscode.cmake-tools"
-			]
+				"ms-vscode.cmake-tools",
+				"sumneko.lua"
+			],
+			"settings": {
+				"Lua.runtime.version": "Lua 5.1",
+			    "Lua.workspace.library": [
+			        "/src/repo/eqemu-definitions"
+			    ],
+			    "Lua.diagnostics.disable": [
+			        "lowercase-global"
+			    ],
+				"cmake.statusbar.advanced": {
+					"kit": {
+						"visibility": "hidden"
+					},
+					"debug": {
+						"visibility": "hidden"
+					},
+					"buildTarget": {
+						"visibility": "compact"
+					},
+					"launch": {
+						"visibility": "hidden"
+					},
+					"ctest": {
+						"visibility": "icon"
+					}
+				}
+			}
 		}
 	},
+	"mounts": [
+    "source=${localWorkspaceFolder}/.devcontainer/Makefile,target=/src/Makefile,type=bind,consistency=cached"
+	],
+
 	"workspaceFolder": "/src",
 	"workspaceMount": "source=${localWorkspaceFolder},target=/src,type=bind,consistency=cached"
 }
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index b09914838..627d3c630 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@
 # CMake
 CMakeCache.txt
 CMakeFiles
+Makefile
 cmake_install.cmake
 install_manifest.txt
 [Bb]uild*/
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 6ab206d34..8bdf6f6fa 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -107,22 +107,5 @@
 		"format": "cpp",
 		"ranges": "cpp",
 		"span": "cpp"
-	},
-	"cmake.statusbar.advanced": {
-		"kit": {
-			"visibility": "hidden",
-		},
-		"debug": {
-			"visibility": "hidden",
-		},
-		"buildTarget": {
-			"visibility": "hidden",
-		},
-		"launch": {
-			"visibility": "hidden",
-		},
-		"ctest": {
-			"visibility": "icon",
-		}
 	}
 }
\ No newline at end of file