diff --git a/Makefile b/Makefile
index 7890a08f..90c6529d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 BC_VAR_PROJECT_NAME=nostalgia
 BC_VAR_PROJECT_NAME_CAP=Nostalgia
+BC_VAR_DEVENV_ROOT=util
 BUILDCORE_PATH=deps/buildcore
 include ${BUILDCORE_PATH}/base.mk
 
@@ -13,7 +14,7 @@ endif
 
 .PHONY: pkg-gba
 pkg-gba: build
-	${BC_CMD_ENVRUN} ${BC_PY3} ./scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
+	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
 
 .PHONY: run
 run: build
diff --git a/Dockerfile b/util/Dockerfile
similarity index 99%
rename from Dockerfile
rename to util/Dockerfile
index 702ff5e4..26817853 100644
--- a/Dockerfile
+++ b/util/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:36
+FROM fedora:41
 
 RUN dnf update -y
 
diff --git a/devenv/entrypoint.sh b/util/devenv/entrypoint.sh
similarity index 100%
rename from devenv/entrypoint.sh
rename to util/devenv/entrypoint.sh
diff --git a/devenv/pacman.conf b/util/devenv/pacman.conf
similarity index 100%
rename from devenv/pacman.conf
rename to util/devenv/pacman.conf
diff --git a/devenv/sudoers b/util/devenv/sudoers
similarity index 100%
rename from devenv/sudoers
rename to util/devenv/sudoers
diff --git a/scripts/pkg-gba.py b/util/scripts/pkg-gba.py
similarity index 100%
rename from scripts/pkg-gba.py
rename to util/scripts/pkg-gba.py