diff --git a/platforms/gc_wii/mwcc_233_144/Dockerfile b/platforms/gc_wii/mwcc_233_144/Dockerfile
index 6d52ae0..85f12d0 100644
--- a/platforms/gc_wii/mwcc_233_144/Dockerfile
+++ b/platforms/gc_wii/mwcc_233_144/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_233_144
+FROM scratch AS release
 
-RUN cp -r GC/1.0/* /compilers/gc_wii/mwcc_233_144
-
-RUN chmod +x /compilers/gc_wii/mwcc_233_144/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_233_144/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_233_144/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_144/lmgr326b.dll /compilers/gc_wii/mwcc_233_144/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_233_144/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_144/lmgr8c.dll /compilers/gc_wii/mwcc_233_144/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_233_144/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/1.0 /compilers/gc_wii/mwcc_233_144
diff --git a/platforms/gc_wii/mwcc_233_159/Dockerfile b/platforms/gc_wii/mwcc_233_159/Dockerfile
index a036ff2..3cddd67 100644
--- a/platforms/gc_wii/mwcc_233_159/Dockerfile
+++ b/platforms/gc_wii/mwcc_233_159/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_233_159
+FROM scratch AS release
 
-RUN cp -r GC/1.1/* /compilers/gc_wii/mwcc_233_159
-
-RUN chmod +x /compilers/gc_wii/mwcc_233_159/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_233_159/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_233_159/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_159/lmgr326b.dll /compilers/gc_wii/mwcc_233_159/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_233_159/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_159/lmgr8c.dll /compilers/gc_wii/mwcc_233_159/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_233_159/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/1.1 /compilers/gc_wii/mwcc_233_159
diff --git a/platforms/gc_wii/mwcc_233_159p1/Dockerfile b/platforms/gc_wii/mwcc_233_159p1/Dockerfile
index 68451e2..31cda28 100644
--- a/platforms/gc_wii/mwcc_233_159p1/Dockerfile
+++ b/platforms/gc_wii/mwcc_233_159p1/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_233_159p1
+FROM scratch AS release
 
-RUN cp -r GC/1.1p1/* /compilers/gc_wii/mwcc_233_159p1
-
-RUN chmod +x /compilers/gc_wii/mwcc_233_159p1/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_233_159p1/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_233_159p1/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_159p1/lmgr326b.dll /compilers/gc_wii/mwcc_233_159p1/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_233_159p1/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_159p1/lmgr8c.dll /compilers/gc_wii/mwcc_233_159p1/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_233_159p1/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/1.1p1 /compilers/gc_wii/mwcc_233_159p1
diff --git a/platforms/gc_wii/mwcc_233_163/Dockerfile b/platforms/gc_wii/mwcc_233_163/Dockerfile
index f76a9a8..48a8d70 100644
--- a/platforms/gc_wii/mwcc_233_163/Dockerfile
+++ b/platforms/gc_wii/mwcc_233_163/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_233_163
+FROM scratch AS release
 
-RUN cp -r GC/1.2.5/* /compilers/gc_wii/mwcc_233_163
-
-RUN chmod +x /compilers/gc_wii/mwcc_233_163/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_233_163/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_233_163/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_163/lmgr326b.dll /compilers/gc_wii/mwcc_233_163/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_233_163/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_163/lmgr8c.dll /compilers/gc_wii/mwcc_233_163/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_233_163/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/1.2.5 /compilers/gc_wii/mwcc_233_163
diff --git a/platforms/gc_wii/mwcc_233_163e/Dockerfile b/platforms/gc_wii/mwcc_233_163e/Dockerfile
index 708438f..1408e8f 100644
--- a/platforms/gc_wii/mwcc_233_163e/Dockerfile
+++ b/platforms/gc_wii/mwcc_233_163e/Dockerfile
@@ -1,36 +1,22 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+# Copy of common/decomp.dev with legacy support for frank.py
 
-WORKDIR /root
+RUN apk add --no-cache curl libarchive-tools
 
-RUN wget -O compilers_20240706.zip "https://files.decomp.dev/compilers_20240706.zip"
-RUN unzip compilers_20240706.zip
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20240706.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN mkdir -p /compilers/gc_wii/mwcc_233_163e
 
-RUN cp -r GC/1.2.5e/* /compilers/gc_wii/mwcc_233_163e
-
-RUN chmod +x /compilers/gc_wii/mwcc_233_163e/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_233_163e/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_233_163e/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_163e/lmgr326b.dll /compilers/gc_wii/mwcc_233_163e/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_233_163e/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_163e/lmgr8c.dll /compilers/gc_wii/mwcc_233_163e/LMGR8C.dll; \
-  fi
 ARG FRANK_HASH=d19668657d2a5efa42cdffb801090d05734b9dbd
-
-RUN wget -O /compilers/gc_wii/mwcc_233_163e/frank.py https://raw.githubusercontent.com/doldecomp/melee/${FRANK_HASH}/tools/frank.py
-RUN cp -r GC/1.2.5/mwcceppc.exe /compilers/gc_wii/mwcc_233_163e/mwcceppc.125.exe
-RUN chmod +x /compilers/gc_wii/mwcc_233_163e/mwcceppc.125.exe
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_233_163e/
+RUN wget -O /compilers/GC/1.2.5e/frank.py https://raw.githubusercontent.com/doldecomp/melee/${FRANK_HASH}/tools/frank.py
+RUN cp -r /compilers/GC/1.2.5/mwcceppc.exe /compilers/GC/1.2.5e/mwcceppc.125.exe
 
 
-FROM scratch as release
+FROM scratch AS release
 
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/1.2.5e /compilers/gc_wii/mwcc_233_163e
diff --git a/platforms/gc_wii/mwcc_233_163n/Dockerfile b/platforms/gc_wii/mwcc_233_163n/Dockerfile
index e7118a7..bf7224c 100644
--- a/platforms/gc_wii/mwcc_233_163n/Dockerfile
+++ b/platforms/gc_wii/mwcc_233_163n/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_233_163n
+FROM scratch AS release
 
-RUN cp -r GC/1.2.5n/* /compilers/gc_wii/mwcc_233_163n
-
-RUN chmod +x /compilers/gc_wii/mwcc_233_163n/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_233_163n/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_233_163n/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_163n/lmgr326b.dll /compilers/gc_wii/mwcc_233_163n/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_233_163n/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_233_163n/lmgr8c.dll /compilers/gc_wii/mwcc_233_163n/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_233_163n/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/1.2.5n /compilers/gc_wii/mwcc_233_163n
diff --git a/platforms/gc_wii/mwcc_242_53/Dockerfile b/platforms/gc_wii/mwcc_242_53/Dockerfile
index 56b1175..e4d5daf 100644
--- a/platforms/gc_wii/mwcc_242_53/Dockerfile
+++ b/platforms/gc_wii/mwcc_242_53/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_242_53
+FROM scratch AS release
 
-RUN cp -r GC/1.3/* /compilers/gc_wii/mwcc_242_53
-
-RUN chmod +x /compilers/gc_wii/mwcc_242_53/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_242_53/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_242_53/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_242_53/lmgr326b.dll /compilers/gc_wii/mwcc_242_53/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_242_53/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_242_53/lmgr8c.dll /compilers/gc_wii/mwcc_242_53/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_242_53/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/1.3 /compilers/gc_wii/mwcc_242_53
diff --git a/platforms/gc_wii/mwcc_242_81/Dockerfile b/platforms/gc_wii/mwcc_242_81/Dockerfile
index ada91b9..c4953dd 100644
--- a/platforms/gc_wii/mwcc_242_81/Dockerfile
+++ b/platforms/gc_wii/mwcc_242_81/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_242_81
+FROM scratch AS release
 
-RUN cp -r GC/1.3.2/* /compilers/gc_wii/mwcc_242_81
-
-RUN chmod +x /compilers/gc_wii/mwcc_242_81/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_242_81/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_242_81/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_242_81/lmgr326b.dll /compilers/gc_wii/mwcc_242_81/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_242_81/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_242_81/lmgr8c.dll /compilers/gc_wii/mwcc_242_81/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_242_81/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/1.3.2 /compilers/gc_wii/mwcc_242_81
diff --git a/platforms/gc_wii/mwcc_242_81r/Dockerfile b/platforms/gc_wii/mwcc_242_81r/Dockerfile
index 553df75..8397321 100644
--- a/platforms/gc_wii/mwcc_242_81r/Dockerfile
+++ b/platforms/gc_wii/mwcc_242_81r/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_242_81r
+FROM scratch AS release
 
-RUN cp -r GC/1.3.2r/* /compilers/gc_wii/mwcc_242_81r
-
-RUN chmod +x /compilers/gc_wii/mwcc_242_81r/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_242_81r/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_242_81r/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_242_81r/lmgr326b.dll /compilers/gc_wii/mwcc_242_81r/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_242_81r/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_242_81r/lmgr8c.dll /compilers/gc_wii/mwcc_242_81r/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_242_81r/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/1.3.2r /compilers/gc_wii/mwcc_242_81r
diff --git a/platforms/gc_wii/mwcc_247_105/Dockerfile b/platforms/gc_wii/mwcc_247_105/Dockerfile
index ac192ab..44cf67b 100644
--- a/platforms/gc_wii/mwcc_247_105/Dockerfile
+++ b/platforms/gc_wii/mwcc_247_105/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_247_105
+FROM scratch AS release
 
-RUN cp -r GC/2.5/* /compilers/gc_wii/mwcc_247_105
-
-RUN chmod +x /compilers/gc_wii/mwcc_247_105/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_247_105/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_247_105/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_247_105/lmgr326b.dll /compilers/gc_wii/mwcc_247_105/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_247_105/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_247_105/lmgr8c.dll /compilers/gc_wii/mwcc_247_105/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_247_105/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/2.5 /compilers/gc_wii/mwcc_247_105
diff --git a/platforms/gc_wii/mwcc_247_107/Dockerfile b/platforms/gc_wii/mwcc_247_107/Dockerfile
index 2864000..0e109b5 100644
--- a/platforms/gc_wii/mwcc_247_107/Dockerfile
+++ b/platforms/gc_wii/mwcc_247_107/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_247_107
+FROM scratch AS release
 
-RUN cp -r GC/2.6/* /compilers/gc_wii/mwcc_247_107
-
-RUN chmod +x /compilers/gc_wii/mwcc_247_107/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_247_107/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_247_107/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_247_107/lmgr326b.dll /compilers/gc_wii/mwcc_247_107/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_247_107/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_247_107/lmgr8c.dll /compilers/gc_wii/mwcc_247_107/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_247_107/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/2.6 /compilers/gc_wii/mwcc_247_107
diff --git a/platforms/gc_wii/mwcc_247_108/Dockerfile b/platforms/gc_wii/mwcc_247_108/Dockerfile
index 6c8dcfe..7ed21df 100644
--- a/platforms/gc_wii/mwcc_247_108/Dockerfile
+++ b/platforms/gc_wii/mwcc_247_108/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_247_108
+FROM scratch AS release
 
-RUN cp -r GC/2.7/* /compilers/gc_wii/mwcc_247_108
-
-RUN chmod +x /compilers/gc_wii/mwcc_247_108/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_247_108/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_247_108/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_247_108/lmgr326b.dll /compilers/gc_wii/mwcc_247_108/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_247_108/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_247_108/lmgr8c.dll /compilers/gc_wii/mwcc_247_108/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_247_108/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/2.7 /compilers/gc_wii/mwcc_247_108
diff --git a/platforms/gc_wii/mwcc_247_92/Dockerfile b/platforms/gc_wii/mwcc_247_92/Dockerfile
index 0fd20ba..a83d318 100644
--- a/platforms/gc_wii/mwcc_247_92/Dockerfile
+++ b/platforms/gc_wii/mwcc_247_92/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_247_92
+FROM scratch AS release
 
-RUN cp -r GC/2.0/* /compilers/gc_wii/mwcc_247_92
-
-RUN chmod +x /compilers/gc_wii/mwcc_247_92/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_247_92/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_247_92/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_247_92/lmgr326b.dll /compilers/gc_wii/mwcc_247_92/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_247_92/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_247_92/lmgr8c.dll /compilers/gc_wii/mwcc_247_92/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_247_92/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/2.0 /compilers/gc_wii/mwcc_247_92
diff --git a/platforms/gc_wii/mwcc_247_92p1/Dockerfile b/platforms/gc_wii/mwcc_247_92p1/Dockerfile
index b3fa7a7..0e877ee 100644
--- a/platforms/gc_wii/mwcc_247_92p1/Dockerfile
+++ b/platforms/gc_wii/mwcc_247_92p1/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_247_92p1
+FROM scratch AS release
 
-RUN cp -r GC/2.0p1/* /compilers/gc_wii/mwcc_247_92p1
-
-RUN chmod +x /compilers/gc_wii/mwcc_247_92p1/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_247_92p1/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_247_92p1/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_247_92p1/lmgr326b.dll /compilers/gc_wii/mwcc_247_92p1/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_247_92p1/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_247_92p1/lmgr8c.dll /compilers/gc_wii/mwcc_247_92p1/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_247_92p1/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/2.0p1 /compilers/gc_wii/mwcc_247_92p1
diff --git a/platforms/gc_wii/mwcc_41_51213/Dockerfile b/platforms/gc_wii/mwcc_41_51213/Dockerfile
index 53677ec..aa20ef0 100644
--- a/platforms/gc_wii/mwcc_41_51213/Dockerfile
+++ b/platforms/gc_wii/mwcc_41_51213/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_41_51213
+FROM scratch AS release
 
-RUN cp -r GC/3.0a3/* /compilers/gc_wii/mwcc_41_51213
-
-RUN chmod +x /compilers/gc_wii/mwcc_41_51213/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_41_51213/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_41_51213/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_41_51213/lmgr326b.dll /compilers/gc_wii/mwcc_41_51213/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_41_51213/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_41_51213/lmgr8c.dll /compilers/gc_wii/mwcc_41_51213/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_41_51213/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/3.0a3 /compilers/gc_wii/mwcc_41_51213
diff --git a/platforms/gc_wii/mwcc_41_60126/Dockerfile b/platforms/gc_wii/mwcc_41_60126/Dockerfile
index 775dc04..b9ee74d 100644
--- a/platforms/gc_wii/mwcc_41_60126/Dockerfile
+++ b/platforms/gc_wii/mwcc_41_60126/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_41_60126
+FROM scratch AS release
 
-RUN cp -r GC/3.0a3.2/* /compilers/gc_wii/mwcc_41_60126
-
-RUN chmod +x /compilers/gc_wii/mwcc_41_60126/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_41_60126/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_41_60126/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_41_60126/lmgr326b.dll /compilers/gc_wii/mwcc_41_60126/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_41_60126/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_41_60126/lmgr8c.dll /compilers/gc_wii/mwcc_41_60126/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_41_60126/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/3.0a3.2 /compilers/gc_wii/mwcc_41_60126
diff --git a/platforms/gc_wii/mwcc_41_60209/Dockerfile b/platforms/gc_wii/mwcc_41_60209/Dockerfile
index b408e08..1f9eae3 100644
--- a/platforms/gc_wii/mwcc_41_60209/Dockerfile
+++ b/platforms/gc_wii/mwcc_41_60209/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_41_60209
+FROM scratch AS release
 
-RUN cp -r GC/3.0a3.3/* /compilers/gc_wii/mwcc_41_60209
-
-RUN chmod +x /compilers/gc_wii/mwcc_41_60209/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_41_60209/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_41_60209/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_41_60209/lmgr326b.dll /compilers/gc_wii/mwcc_41_60209/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_41_60209/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_41_60209/lmgr8c.dll /compilers/gc_wii/mwcc_41_60209/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_41_60209/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/3.0a3.3 /compilers/gc_wii/mwcc_41_60209
diff --git a/platforms/gc_wii/mwcc_41_60831/Dockerfile b/platforms/gc_wii/mwcc_41_60831/Dockerfile
index d1477d1..9d8edf0 100644
--- a/platforms/gc_wii/mwcc_41_60831/Dockerfile
+++ b/platforms/gc_wii/mwcc_41_60831/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_41_60831
+FROM scratch AS release
 
-RUN cp -r GC/3.0a5.2/* /compilers/gc_wii/mwcc_41_60831
-
-RUN chmod +x /compilers/gc_wii/mwcc_41_60831/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_41_60831/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_41_60831/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_41_60831/lmgr326b.dll /compilers/gc_wii/mwcc_41_60831/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_41_60831/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_41_60831/lmgr8c.dll /compilers/gc_wii/mwcc_41_60831/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_41_60831/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/3.0a5.2 /compilers/gc_wii/mwcc_41_60831
diff --git a/platforms/gc_wii/mwcc_42_127/Dockerfile b/platforms/gc_wii/mwcc_42_127/Dockerfile
index 45b17bc..9b32ff4 100644
--- a/platforms/gc_wii/mwcc_42_127/Dockerfile
+++ b/platforms/gc_wii/mwcc_42_127/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_42_127
+FROM scratch AS release
 
-RUN cp -r Wii/0x4201_127/* /compilers/gc_wii/mwcc_42_127
-
-RUN chmod +x /compilers/gc_wii/mwcc_42_127/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_42_127/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_42_127/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_42_127/lmgr326b.dll /compilers/gc_wii/mwcc_42_127/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_42_127/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_42_127/lmgr8c.dll /compilers/gc_wii/mwcc_42_127/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_42_127/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/Wii/0x4201_127 /compilers/gc_wii/mwcc_42_127
diff --git a/platforms/gc_wii/mwcc_42_140/Dockerfile b/platforms/gc_wii/mwcc_42_140/Dockerfile
index e6c2889..8ff6e87 100644
--- a/platforms/gc_wii/mwcc_42_140/Dockerfile
+++ b/platforms/gc_wii/mwcc_42_140/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_42_140
+FROM scratch AS release
 
-RUN cp -r Wii/1.0RC1/* /compilers/gc_wii/mwcc_42_140
-
-RUN chmod +x /compilers/gc_wii/mwcc_42_140/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_42_140/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_42_140/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_42_140/lmgr326b.dll /compilers/gc_wii/mwcc_42_140/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_42_140/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_42_140/lmgr8c.dll /compilers/gc_wii/mwcc_42_140/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_42_140/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/Wii/1.0RC1 /compilers/gc_wii/mwcc_42_140
diff --git a/platforms/gc_wii/mwcc_42_142/Dockerfile b/platforms/gc_wii/mwcc_42_142/Dockerfile
index d8f40d1..43dae68 100644
--- a/platforms/gc_wii/mwcc_42_142/Dockerfile
+++ b/platforms/gc_wii/mwcc_42_142/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_42_142
+FROM scratch AS release
 
-RUN cp -r Wii/1.0a/* /compilers/gc_wii/mwcc_42_142
-
-RUN chmod +x /compilers/gc_wii/mwcc_42_142/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_42_142/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_42_142/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_42_142/lmgr326b.dll /compilers/gc_wii/mwcc_42_142/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_42_142/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_42_142/lmgr8c.dll /compilers/gc_wii/mwcc_42_142/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_42_142/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/Wii/1.0a /compilers/gc_wii/mwcc_42_142
diff --git a/platforms/gc_wii/mwcc_42_60308/Dockerfile b/platforms/gc_wii/mwcc_42_60308/Dockerfile
index e131909..26cf428 100644
--- a/platforms/gc_wii/mwcc_42_60308/Dockerfile
+++ b/platforms/gc_wii/mwcc_42_60308/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_42_60308
+FROM scratch AS release
 
-RUN cp -r GC/3.0a3.4/* /compilers/gc_wii/mwcc_42_60308
-
-RUN chmod +x /compilers/gc_wii/mwcc_42_60308/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_42_60308/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_42_60308/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_42_60308/lmgr326b.dll /compilers/gc_wii/mwcc_42_60308/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_42_60308/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_42_60308/lmgr8c.dll /compilers/gc_wii/mwcc_42_60308/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_42_60308/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/3.0a3.4 /compilers/gc_wii/mwcc_42_60308
diff --git a/platforms/gc_wii/mwcc_42_60422/Dockerfile b/platforms/gc_wii/mwcc_42_60422/Dockerfile
index 09aa130..f29a75c 100644
--- a/platforms/gc_wii/mwcc_42_60422/Dockerfile
+++ b/platforms/gc_wii/mwcc_42_60422/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_42_60422
+FROM scratch AS release
 
-RUN cp -r GC/3.0a5/* /compilers/gc_wii/mwcc_42_60422
-
-RUN chmod +x /compilers/gc_wii/mwcc_42_60422/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_42_60422/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_42_60422/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_42_60422/lmgr326b.dll /compilers/gc_wii/mwcc_42_60422/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_42_60422/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_42_60422/lmgr8c.dll /compilers/gc_wii/mwcc_42_60422/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_42_60422/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/GC/3.0a5 /compilers/gc_wii/mwcc_42_60422
diff --git a/platforms/gc_wii/mwcc_43_145/Dockerfile b/platforms/gc_wii/mwcc_43_145/Dockerfile
index 0114973..808de94 100644
--- a/platforms/gc_wii/mwcc_43_145/Dockerfile
+++ b/platforms/gc_wii/mwcc_43_145/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_43_145
+FROM scratch AS release
 
-RUN cp -r Wii/1.0/* /compilers/gc_wii/mwcc_43_145
-
-RUN chmod +x /compilers/gc_wii/mwcc_43_145/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_43_145/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_43_145/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_145/lmgr326b.dll /compilers/gc_wii/mwcc_43_145/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_43_145/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_145/lmgr8c.dll /compilers/gc_wii/mwcc_43_145/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_43_145/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/Wii/1.0 /compilers/gc_wii/mwcc_43_145
diff --git a/platforms/gc_wii/mwcc_43_151/Dockerfile b/platforms/gc_wii/mwcc_43_151/Dockerfile
index 2ea879a..d2b001d 100644
--- a/platforms/gc_wii/mwcc_43_151/Dockerfile
+++ b/platforms/gc_wii/mwcc_43_151/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_43_151
+FROM scratch AS release
 
-RUN cp -r Wii/1.1/* /compilers/gc_wii/mwcc_43_151
-
-RUN chmod +x /compilers/gc_wii/mwcc_43_151/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_43_151/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_43_151/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_151/lmgr326b.dll /compilers/gc_wii/mwcc_43_151/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_43_151/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_151/lmgr8c.dll /compilers/gc_wii/mwcc_43_151/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_43_151/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/Wii/1.1 /compilers/gc_wii/mwcc_43_151
diff --git a/platforms/gc_wii/mwcc_43_172/Dockerfile b/platforms/gc_wii/mwcc_43_172/Dockerfile
index 8b2b54e..451309d 100644
--- a/platforms/gc_wii/mwcc_43_172/Dockerfile
+++ b/platforms/gc_wii/mwcc_43_172/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_43_172
+FROM scratch AS release
 
-RUN cp -r Wii/1.3/* /compilers/gc_wii/mwcc_43_172
-
-RUN chmod +x /compilers/gc_wii/mwcc_43_172/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_43_172/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_43_172/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_172/lmgr326b.dll /compilers/gc_wii/mwcc_43_172/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_43_172/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_172/lmgr8c.dll /compilers/gc_wii/mwcc_43_172/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_43_172/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/Wii/1.3 /compilers/gc_wii/mwcc_43_172
diff --git a/platforms/gc_wii/mwcc_43_188/Dockerfile b/platforms/gc_wii/mwcc_43_188/Dockerfile
index 2404679..ff06f1d 100644
--- a/platforms/gc_wii/mwcc_43_188/Dockerfile
+++ b/platforms/gc_wii/mwcc_43_188/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_43_188
+FROM scratch AS release
 
-RUN cp -r Wii/1.5/* /compilers/gc_wii/mwcc_43_188
-
-RUN chmod +x /compilers/gc_wii/mwcc_43_188/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_43_188/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_43_188/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_188/lmgr326b.dll /compilers/gc_wii/mwcc_43_188/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_43_188/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_188/lmgr8c.dll /compilers/gc_wii/mwcc_43_188/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_43_188/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/Wii/1.5 /compilers/gc_wii/mwcc_43_188
diff --git a/platforms/gc_wii/mwcc_43_202/Dockerfile b/platforms/gc_wii/mwcc_43_202/Dockerfile
index 1ca4aef..b49460c 100644
--- a/platforms/gc_wii/mwcc_43_202/Dockerfile
+++ b/platforms/gc_wii/mwcc_43_202/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_43_202
+FROM scratch AS release
 
-RUN cp -r Wii/1.6/* /compilers/gc_wii/mwcc_43_202
-
-RUN chmod +x /compilers/gc_wii/mwcc_43_202/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_43_202/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_43_202/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_202/lmgr326b.dll /compilers/gc_wii/mwcc_43_202/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_43_202/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_202/lmgr8c.dll /compilers/gc_wii/mwcc_43_202/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_43_202/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/Wii/1.6 /compilers/gc_wii/mwcc_43_202
diff --git a/platforms/gc_wii/mwcc_43_213/Dockerfile b/platforms/gc_wii/mwcc_43_213/Dockerfile
index 358fd44..f245a85 100644
--- a/platforms/gc_wii/mwcc_43_213/Dockerfile
+++ b/platforms/gc_wii/mwcc_43_213/Dockerfile
@@ -1,31 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-# download zip first to allow for Docker caching
+RUN apk add --no-cache curl libarchive-tools
 
-WORKDIR /root
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN wget -O compilers_20250520.zip "https://files.decomp.dev/compilers_20250520.zip"
-RUN unzip compilers_20250520.zip
 
-RUN mkdir -p /compilers/gc_wii/mwcc_43_213
+FROM scratch AS release
 
-RUN cp -r Wii/1.7/* /compilers/gc_wii/mwcc_43_213
-
-RUN chmod +x /compilers/gc_wii/mwcc_43_213/mwcceppc.exe
-RUN touch /compilers/gc_wii/mwcc_43_213/license.dat
-RUN if [[ -f /compilers/gc_wii/mwcc_43_213/lmgr326b.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_213/lmgr326b.dll /compilers/gc_wii/mwcc_43_213/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/gc_wii/mwcc_43_213/lmgr8c.dll ]]; then \
-    mv /compilers/gc_wii/mwcc_43_213/lmgr8c.dll /compilers/gc_wii/mwcc_43_213/LMGR8C.dll; \
-  fi
-
-RUN chown -R root:root /compilers/gc_wii/mwcc_43_213/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/Wii/1.7 /compilers/gc_wii/mwcc_43_213
diff --git a/platforms/gc_wii/prodg_35/Dockerfile b/platforms/gc_wii/prodg_35/Dockerfile
index 08601e5..b64297c 100644
--- a/platforms/gc_wii/prodg_35/Dockerfile
+++ b/platforms/gc_wii/prodg_35/Dockerfile
@@ -1,17 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-RUN mkdir -p /compilers/gc_wii/prodg_35
+RUN apk add --no-cache curl libarchive-tools
 
-RUN wget -O prodg_35.tar.gz "https://github.com/decompme/compilers/releases/download/compilers/prodg_35.tar.gz"
-RUN tar xvzf prodg_35.tar.gz -C /compilers/gc_wii/prodg_35
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN chown -R root:root /compilers/gc_wii/prodg_35/
-RUN chmod +x /compilers/gc_wii/prodg_35/*
 
+FROM scratch AS release
 
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/ProDG/3.5 /compilers/gc_wii/prodg_35
diff --git a/platforms/gc_wii/prodg_35_b140/Dockerfile b/platforms/gc_wii/prodg_35_b140/Dockerfile
index 1795621..e332b68 100644
--- a/platforms/gc_wii/prodg_35_b140/Dockerfile
+++ b/platforms/gc_wii/prodg_35_b140/Dockerfile
@@ -1,17 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-RUN mkdir -p /compilers/gc_wii/prodg_35_b140
+RUN apk add --no-cache curl libarchive-tools
 
-RUN wget -O prodg_35_b140.tar.gz "https://github.com/decompme/compilers/releases/download/compilers/prodg_35_b140.tar.gz"
-RUN tar xvzf prodg_35_b140.tar.gz -C /compilers/gc_wii/prodg_35_b140
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN chown -R root:root /compilers/gc_wii/prodg_35_b140/
-RUN chmod +x /compilers/gc_wii/prodg_35_b140/*
 
+FROM scratch AS release
 
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/ProDG/3.5b140 /compilers/gc_wii/prodg_35_b140
diff --git a/platforms/gc_wii/prodg_37/Dockerfile b/platforms/gc_wii/prodg_37/Dockerfile
index 69a2d82..fb00c27 100644
--- a/platforms/gc_wii/prodg_37/Dockerfile
+++ b/platforms/gc_wii/prodg_37/Dockerfile
@@ -1,17 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-RUN mkdir -p /compilers/gc_wii/prodg_37
+RUN apk add --no-cache curl libarchive-tools
 
-RUN wget -O prodg_37.tar.gz "https://github.com/decompme/compilers/releases/download/compilers/prodg_37.tar.gz"
-RUN tar xvzf prodg_37.tar.gz -C /compilers/gc_wii/prodg_37
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN chown -R root:root /compilers/gc_wii/prodg_37/
-RUN chmod +x /compilers/gc_wii/prodg_37/*
 
+FROM scratch AS release
 
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/ProDG/3.7 /compilers/gc_wii/prodg_37
diff --git a/platforms/gc_wii/prodg_381/Dockerfile b/platforms/gc_wii/prodg_381/Dockerfile
index 7ec6344..cbca0bf 100644
--- a/platforms/gc_wii/prodg_381/Dockerfile
+++ b/platforms/gc_wii/prodg_381/Dockerfile
@@ -1,17 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-RUN mkdir -p /compilers/gc_wii/prodg_381
+RUN apk add --no-cache curl libarchive-tools
 
-RUN wget -O prodg_381.tar.gz "https://github.com/decompme/compilers/releases/download/compilers/prodg_381.tar.gz?2025-02-13"
-RUN tar xvzf prodg_381.tar.gz -C /compilers/gc_wii/prodg_381
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN chown -R root:root /compilers/gc_wii/prodg_381/
-RUN chmod +x /compilers/gc_wii/prodg_381/*
 
+FROM scratch AS release
 
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/ProDG/3.8.1 /compilers/gc_wii/prodg_381
diff --git a/platforms/gc_wii/prodg_393/Dockerfile b/platforms/gc_wii/prodg_393/Dockerfile
index f89e112..a199372 100644
--- a/platforms/gc_wii/prodg_393/Dockerfile
+++ b/platforms/gc_wii/prodg_393/Dockerfile
@@ -1,17 +1,15 @@
 # NOTE: This file is generated automatically via template.py. Do not edit manually!
 
 
-FROM alpine:3.18 as base
+FROM alpine:3.18 AS base
 
-RUN mkdir -p /compilers/gc_wii/prodg_393
+RUN apk add --no-cache curl libarchive-tools
 
-RUN wget -O prodg_393.tar.gz "https://github.com/decompme/compilers/releases/download/compilers/prodg_393.tar.gz?2025-02-13"
-RUN tar xvzf prodg_393.tar.gz -C /compilers/gc_wii/prodg_393
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
 
-RUN chown -R root:root /compilers/gc_wii/prodg_393/
-RUN chmod +x /compilers/gc_wii/prodg_393/*
 
+FROM scratch AS release
 
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
+COPY --from=base /compilers/ProDG/3.9.3 /compilers/gc_wii/prodg_393
diff --git a/platforms/xbox360/msvc_ppc_14.00.2110/Dockerfile b/platforms/xbox360/msvc_ppc_14.00.2110/Dockerfile
new file mode 100644
index 0000000..e72c1aa
--- /dev/null
+++ b/platforms/xbox360/msvc_ppc_14.00.2110/Dockerfile
@@ -0,0 +1,15 @@
+# NOTE: This file is generated automatically via template.py. Do not edit manually!
+
+
+FROM alpine:3.18 AS base
+
+RUN apk add --no-cache curl libarchive-tools
+
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
+
+
+FROM scratch AS release
+
+COPY --from=base /compilers/X360/14.00.2110 /compilers/xbox360/msvc_ppc_14.00.2110
diff --git a/platforms/xbox360/msvc_ppc_16.00.11886.00/Dockerfile b/platforms/xbox360/msvc_ppc_16.00.11886.00/Dockerfile
new file mode 100644
index 0000000..c965baa
--- /dev/null
+++ b/platforms/xbox360/msvc_ppc_16.00.11886.00/Dockerfile
@@ -0,0 +1,15 @@
+# NOTE: This file is generated automatically via template.py. Do not edit manually!
+
+
+FROM alpine:3.18 AS base
+
+RUN apk add --no-cache curl libarchive-tools
+
+RUN mkdir compilers \
+    && curl -L "https://files.decomp.dev/compilers_20251015.zip" \
+    | bsdtar -xvf- -C /compilers
+
+
+FROM scratch AS release
+
+COPY --from=base /compilers/X360/16.00.11886.00 /compilers/xbox360/msvc_ppc_16.00.11886.00
diff --git a/templates/common/decomp.dev.j2 b/templates/common/decomp.dev.j2
new file mode 100644
index 0000000..bd1192a
--- /dev/null
+++ b/templates/common/decomp.dev.j2
@@ -0,0 +1,12 @@
+FROM alpine:3.18 AS base
+
+RUN apk add --no-cache curl libarchive-tools
+
+RUN mkdir compilers \
+    && curl -L "{{ file }}" \
+    | bsdtar -xvf- -C /compilers
+
+
+FROM scratch AS release
+
+COPY --from=base /compilers/{{ package_dir }} /compilers/{{ platform }}/{{ id }}
diff --git a/templates/gc_wii/frank.j2 b/templates/gc_wii/frank.j2
new file mode 100644
index 0000000..ab7ff04
--- /dev/null
+++ b/templates/gc_wii/frank.j2
@@ -0,0 +1,20 @@
+FROM alpine:3.18 AS base
+
+# Copy of common/decomp.dev with legacy support for frank.py
+
+RUN apk add --no-cache curl libarchive-tools
+
+RUN mkdir compilers \
+    && curl -L "{{ file }}" \
+    | bsdtar -xvf- -C /compilers
+
+{% if frank_mwcceppc is defined %}
+ARG FRANK_HASH=d19668657d2a5efa42cdffb801090d05734b9dbd
+RUN wget -O /compilers/{{ package_dir }}/frank.py https://raw.githubusercontent.com/doldecomp/melee/${FRANK_HASH}/tools/frank.py
+RUN cp -r /compilers/{{ frank_mwcceppc }}/mwcceppc.exe /compilers/{{ package_dir }}/mwcceppc.125.exe
+{%- endif %}
+
+
+FROM scratch AS release
+
+COPY --from=base /compilers/{{ package_dir }} /compilers/{{ platform }}/{{ id }}
diff --git a/templates/gc_wii/mwcceppc.j2 b/templates/gc_wii/mwcceppc.j2
deleted file mode 100644
index e19b008..0000000
--- a/templates/gc_wii/mwcceppc.j2
+++ /dev/null
@@ -1,38 +0,0 @@
-FROM alpine:3.18 as base
-
-# download zip first to allow for Docker caching
-
-WORKDIR /root
-
-{%- set filename = file.split("/")[-1].split("?")[0] %}
-
-RUN wget -O {{ filename }} "{{ file }}"
-RUN unzip {{ filename }}
-
-RUN mkdir -p /compilers/{{ platform }}/{{ id }}
-
-RUN cp -r {{ package_dir }}/* /compilers/{{ platform }}/{{ id }}
-
-RUN chmod +x /compilers/{{ platform }}/{{ id }}/mwcceppc.exe
-RUN touch /compilers/{{ platform }}/{{ id }}/license.dat
-RUN if [[ -f /compilers/{{ platform }}/{{ id }}/lmgr326b.dll ]]; then \
-    mv /compilers/{{ platform }}/{{ id }}/lmgr326b.dll /compilers/{{ platform }}/{{ id }}/LMGR326B.dll; \
-  fi
-RUN if [[ -f /compilers/{{ platform }}/{{ id }}/lmgr8c.dll ]]; then \
-    mv /compilers/{{ platform }}/{{ id }}/lmgr8c.dll /compilers/{{ platform }}/{{ id }}/LMGR8C.dll; \
-  fi
-
-{%- if frank_mwcceppc is defined %}
-ARG FRANK_HASH=d19668657d2a5efa42cdffb801090d05734b9dbd
-
-RUN wget -O /compilers/{{ platform }}/{{ id }}/frank.py https://raw.githubusercontent.com/doldecomp/melee/${FRANK_HASH}/tools/frank.py
-RUN cp -r {{ frank_mwcceppc }}/mwcceppc.exe /compilers/{{ platform }}/{{ id }}/mwcceppc.125.exe
-RUN chmod +x /compilers/{{ platform }}/{{ id }}/mwcceppc.125.exe
-{%- endif %}
-
-RUN chown -R root:root /compilers/{{ platform }}/{{ id }}/
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
diff --git a/templates/gc_wii/prodg.j2 b/templates/gc_wii/prodg.j2
deleted file mode 100644
index f8409d7..0000000
--- a/templates/gc_wii/prodg.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM alpine:3.18 as base
-
-RUN mkdir -p /compilers/{{ platform }}/{{ id }}
-
-{%- set filename = file.split("/")[-1].split("?")[0] %}
-
-RUN wget -O {{ filename }} "{{ file }}"
-RUN tar xvzf {{ filename }} --strip-components=1 -C /compilers/{{ platform }}/{{ id }}
-
-RUN chown -R root:root /compilers/{{ platform }}/{{ id }}/
-RUN chmod +x /compilers/{{ platform }}/{{ id }}/*
-
-
-FROM scratch as release
-
-COPY --from=base /compilers /compilers
diff --git a/values.yaml b/values.yaml
index 7d8f541..b97b1c5 100644
--- a/values.yaml
+++ b/values.yaml
@@ -1,5 +1,5 @@
 vars:
-  - &wii_gc_compilers https://files.decomp.dev/compilers_20250520.zip
+  - &decomp_dev https://files.decomp.dev/compilers_20251015.zip
   - &nds_mwcc https://github.com/decompme/compilers/releases/download/compilers/mwccarm.zip
   - &3ds_armcc https://github.com/decompme/compilers/releases/download/compilers/armcc.zip
 
@@ -771,149 +771,149 @@ compilers:
 # WII & GCC
   - id: mwcc_233_144
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/1.0
   - id: mwcc_233_159
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/1.1
   - id: mwcc_233_159p1
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/1.1p1
   - id: mwcc_233_163
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/1.2.5
   - id: mwcc_233_163n
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/1.2.5n
   - id: mwcc_242_53
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/1.3
   - id: mwcc_242_81
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/1.3.2
   - id: mwcc_242_81r
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/1.3.2r
   - id: mwcc_247_92
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/2.0
   - id: mwcc_247_92p1
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/2.0p1
   - id: mwcc_247_105
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/2.5
   - id: mwcc_247_107
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/2.6
   - id: mwcc_247_108
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/2.7
   - id: mwcc_41_51213
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/3.0a3
   - id: mwcc_41_60126
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/3.0a3.2
   - id: mwcc_41_60209
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/3.0a3.3
   - id: mwcc_42_60308
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/3.0a3.4
   - id: mwcc_42_60422
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/3.0a5
   - id: mwcc_41_60831
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: GC/3.0a5.2
 
   - id: mwcc_42_127
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: Wii/0x4201_127
   - id: mwcc_42_140
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: Wii/1.0RC1
   - id: mwcc_42_142
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: Wii/1.0a
   - id: mwcc_43_145
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: Wii/1.0
   - id: mwcc_43_151
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: Wii/1.1
   - id: mwcc_43_172
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: Wii/1.3
   - id: mwcc_43_188
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: Wii/1.5
   - id: mwcc_43_202
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: Wii/1.6
   - id: mwcc_43_213
     platform: gc_wii
-    template: gc_wii/mwcceppc
-    file: *wii_gc_compilers
+    template: common/decomp.dev
+    file: *decomp_dev
     package_dir: Wii/1.7
 
   - id: mwcc_233_163e
     platform: gc_wii
-    template: gc_wii/mwcceppc
+    template: gc_wii/frank
     # Version was removed from later archives
     file: https://files.decomp.dev/compilers_20240706.zip
     package_dir: GC/1.2.5e
@@ -921,24 +921,29 @@ compilers:
 
   - id: prodg_35
     platform: gc_wii
-    template: common/default
-    file: https://github.com/decompme/compilers/releases/download/compilers/prodg_35.tar.gz
+    template: common/decomp.dev
+    file: *decomp_dev
+    package_dir: ProDG/3.5
   - id: prodg_35_b140
     platform: gc_wii
-    template: common/default
-    file: https://github.com/decompme/compilers/releases/download/compilers/prodg_35_b140.tar.gz
+    template: common/decomp.dev
+    file: *decomp_dev
+    package_dir: ProDG/3.5b140
   - id: prodg_37
     platform: gc_wii
-    template: common/default
-    file: https://github.com/decompme/compilers/releases/download/compilers/prodg_37.tar.gz
+    template: common/decomp.dev
+    file: *decomp_dev
+    package_dir: ProDG/3.7
   - id: prodg_381
     platform: gc_wii
-    template: common/default
-    file: https://github.com/decompme/compilers/releases/download/compilers/prodg_381.tar.gz?2025-02-13
+    template: common/decomp.dev
+    file: *decomp_dev
+    package_dir: ProDG/3.8.1
   - id: prodg_393
     platform: gc_wii
-    template: common/default
-    file: https://github.com/decompme/compilers/releases/download/compilers/prodg_393.tar.gz?2025-02-13
+    template: common/decomp.dev
+    file: *decomp_dev
+    package_dir: ProDG/3.9.3
 
 # DOS
   - id: wcc10.5
@@ -1092,3 +1097,15 @@ compilers:
     platform: dreamcast
     template: common/default
     file: https://github.com/decompme/compilers/releases/download/compilers/shc-v5.1r13.tar.gz
+
+  # Xbox 360
+  - id: msvc_ppc_14.00.2110
+    platform: xbox360
+    template: common/decomp.dev
+    file: *decomp_dev
+    package_dir: X360/14.00.2110
+  - id: msvc_ppc_16.00.11886.00
+    platform: xbox360
+    template: common/decomp.dev
+    file: *decomp_dev
+    package_dir: X360/16.00.11886.00