diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml
index 18170da..7c2bf62 100644
--- a/.gitea/workflows/pipeline.yml
+++ b/.gitea/workflows/pipeline.yml
@@ -21,7 +21,7 @@ env:
   IMAGE_REPO_MINECRAFT: minecraft
   IMAGE_TAG_DEBIAN: bookworm
   DIGEST_FILE: .cache/debian-base.digest
-  VERSIONS: vanilla testing-vanilla fabric testing-fabric neoforged testing-neoforged forge testing-forge bukkit testing-bukkit
+  VERSIONS: testing vanilla fabric neoforged forge bukkit
 
 jobs:
   poll-debian-base-and-detect-changes:
@@ -149,7 +149,7 @@ jobs:
       needs.poll-debian-base-and-detect-changes.outputs.new_versions != ''
     strategy:
       matrix:
-        version: [vanilla, testing-vanilla, fabric, testing-fabric, neoforged, testing-neoforged, forge, testing-forge, bukkit, testing-bukkit]
+        version: [testing, vanilla, fabric, neoforged, forge, bukkit]
     name: Build and Push ${{ matrix.version }}
     steps:
       - name: Checkout repo
diff --git a/bukkit/install_script.sh b/bukkit/install_script.sh
index 8c5583f..66536b4 100644
--- a/bukkit/install_script.sh
+++ b/bukkit/install_script.sh
@@ -21,23 +21,23 @@ if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ]
 		echo "WARNING ! craftbukkit-$MC_VERSION.jar is out of date/missing ... will download now."
 		echo " "
 		echo "INFO ! Cleaning old files."
-		cd $MC_DIR
-		rm -fr craftbukkit-*.jar run-*.sh
-		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O craftbukkit-$MC_VERSION.jar
-		chmod +x craftbukkit-$MC_VERSION.jar
-		cd ..
+		mkdir $MC_DIR/old-server-versions/
+		mv $MC_DIR/craftbukkit-*.sh $MC_DIR/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O $MC_DIR/craftbukkit-$MC_VERSION.jar
+		chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar
 fi
 
 # Looking for run-${MC_VERSION}.sh
-if [ -e /MCserver/run-$MC_VERSION.sh ]
+if [ -e $MC_DIR/run-$MC_VERSION.sh ]
 	then
 		echo " "
 		echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
 	else
 		echo " "
 		echo "WARNING ! run.sh is out of date/missing ... will download now."
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
-		chmod +x /MCserver/run-$MC_VERSION.sh
+		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
+		chmod +x $MC_DIR/run-$MC_VERSION.sh
 fi
 
 echo "INFO ! Setting game port."
diff --git a/forge/Install_Script.sh b/forge/Install_Script.sh
index 476303c..c5365df 100644
--- a/forge/Install_Script.sh
+++ b/forge/Install_Script.sh
@@ -22,7 +22,11 @@ if [ -e $MC_DIR/forge-$MC_VERSION-$FORGE_VERSION-installer.jar ]
 		echo " "
 		echo "INFO ! Cleaning old files."
 		cd $MC_DIR
-		rm -fr neoforge-*.jar run-*.sh /libraries
+		mkdir /old-server-versions/
+		mv neoforge-*.jar old-server-versions/
+		mv run-*.sh old-server-versions/ 
+		mv /libraries /libraries_OLD
+		mv /libraries_OLD old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
 		chmod +x forge-$MC_VERSION-$FORGE_VERSION-installer.jar
 		java -jar forge-$MC_VERSION-$FORGE_VERSION-installer.jar --installServer
diff --git a/neoforged/Install_Script.sh b/neoforged/Install_Script.sh
index 9ef4efc..b2223d4 100644
--- a/neoforged/Install_Script.sh
+++ b/neoforged/Install_Script.sh
@@ -21,7 +21,11 @@ if [ -e $MC_DIR/neoforge-$NEOFORGED_VERSION-installer.jar ]
 		echo " "
 		echo "INFO ! Cleaning old files."
 		cd $MC_DIR
-		rm -fr neoforge-*.jar run-*.sh /libraries
+		mkdir /old-server-versions/
+		mv neoforge-*.jar old-server-versions/
+		mv run-*.sh old-server-versions/ 
+		mv /libraries /libraries_OLD
+		mv /libraries_OLD old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-installer.jar
 		chmod +x neoforge-$NEOFORGED_VERSION-installer.jar
 		java -jar neoforge-$NEOFORGED_VERSION-installer.jar --installServer
diff --git a/testing-bukkit/CHANGES.md b/testing-bukkit/CHANGES.md
deleted file mode 100644
index 8c29ae8..0000000
--- a/testing-bukkit/CHANGES.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## 2025-12-20T15:42:41Z
-
-- variable fixes (fithwum)
-- EULA test & URL fixes (fithwum)
-- EULA test (fithwum)
diff --git a/testing-bukkit/Dockerfile b/testing-bukkit/Dockerfile
deleted file mode 100644
index c31c946..0000000
--- a/testing-bukkit/Dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM gitea.fithwum.tech/fithwum/debian-base:bookworm
-LABEL maintainer="fithwum"
-
-# Environment Variables
-ENV ACCEPT_EULA=""
-ENV GAME_PORT=""
-ENV MC_VERSION=""
-ENV XMX_SIZE=""
-ENV XMS_SIZE=""
-ENV XMN_SIZE=""
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing-bukkit/install_script.sh
-
-# Install Dependencies.
-RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
-	&& apt-get -y --fix-broken install \
-	&& apt-get -y autoclean \
-	&& apt-get -y autoremove \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& update-ca-certificates -f;
-
-# Install java
-RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-	&& dpkg -i packages-microsoft-prod.deb \
-	&& apt-get update && apt-get install -y msopenjdk-21 \
-	&& apt-get -y update && apt-get -y --fix-broken install
-
-# Folder creation.
-RUN mkdir -p /MCserver /MCtemp \
-	&& chmod 777 -R /MCserver /MCtemp \
-	&& chown 99:100 -R /MCserver /MCtemp
-
-# Main script
-RUN wget "$INSTALL_SCRIPT" -O /MCtemp/install_script.sh \
-	&& chmod +x /MCtemp/install_script.sh
-
-# Directory where data is stored
-VOLUME /MCserver
-
-# Run command
-CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]
\ No newline at end of file
diff --git a/testing-bukkit/build-info.json b/testing-bukkit/build-info.json
deleted file mode 100644
index 7c105aa..0000000
--- a/testing-bukkit/build-info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "version": "testing-bukkit",
-  "commit": "e33b177b42cccad6869e64461be53ca8093a3da2",
-  "build_time": "2025-12-20T15:46:20Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:testing-bukkit",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:a9cf77d913e882c46ff7443854d6fc947ceff8ca742a4b1cccd66662106328d2",
-  "image_size": "1GB",
-  "image_size_bytes": 1136086323
-}
diff --git a/testing-bukkit/install_script.sh b/testing-bukkit/install_script.sh
deleted file mode 100644
index 8c5583f..0000000
--- a/testing-bukkit/install_script.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_DIR=/MCserver
-EULA_FILE=$MC_DIR/eula.txt
-EULA_MARKER=$MC_DIR/.eula_accepted
-
-# Main Install Links
-INSTALLER_FILE=https://cdn.getbukkit.org/craftbukkit/craftbukkit-$MC_VERSION.jar
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/bukkit/run.sh
-
-# Main install (Debian).
-# Check for server files and download if needed.
-if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ]
-	then
-		echo " "
-		echo "INFO ! craftbukkit-$MC_VERSION.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! craftbukkit-$MC_VERSION.jar is out of date/missing ... will download now."
-		echo " "
-		echo "INFO ! Cleaning old files."
-		cd $MC_DIR
-		rm -fr craftbukkit-*.jar run-*.sh
-		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O craftbukkit-$MC_VERSION.jar
-		chmod +x craftbukkit-$MC_VERSION.jar
-		cd ..
-fi
-
-# Looking for run-${MC_VERSION}.sh
-if [ -e /MCserver/run-$MC_VERSION.sh ]
-	then
-		echo " "
-		echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
-	else
-		echo " "
-		echo "WARNING ! run.sh is out of date/missing ... will download now."
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
-		chmod +x /MCserver/run-$MC_VERSION.sh
-fi
-
-echo "INFO ! Setting game port."
-if [ -f $MC_DIR/server.properties ]; then
-	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
-fi
-
-# Wait briefly for installer/server to generate eula.txt
-if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
-    echo "INFO ! Waiting for EULA generation..."
-    sleep 5
-fi
-
-# If EULA already accepted once, never touch it again
-if [ -f "$EULA_MARKER" ]; then
-    echo "INFO ! EULA previously accepted"
-    return 0 2>/dev/null || true
-fi
-
-# First-time decision
-if [ "$ACCEPT_EULA" = "true" ]; then
-    echo "INFO ! Accepting EULA (one-time)"
-    sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \
-    || echo "eula=true" > "$EULA_FILE"
-    touch "$EULA_MARKER"
-elif [ "$ACCEPT_EULA" = "false" ]; then
-    echo "WARNING ! EULA not accepted on first run"
-    echo "WARNING ! Set ACCEPT_EULA=true to proceed"
-    sleep infinity
-else
-    echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
-    sleep infinity
-fi
-
-# Set permissions.
-chown 99:100 -R $MC_DIR
-chmod 777 -R $MC_DIR
-
-sleep 1
-
-# Run Minecraft server.
-echo " "
-echo "INFO ! Starting Minecraft Server $MC_VERSION"
-cd $MC_DIR
-exec ./run-$MC_VERSION.sh nogui
-
-exit
\ No newline at end of file
diff --git a/testing-bukkit/run.sh b/testing-bukkit/run.sh
deleted file mode 100644
index 51230be..0000000
--- a/testing-bukkit/run.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2020 fithwum
-# All rights reserved
-
-cd /MCserver
-JAR=./craftbukkit-*.jar
-
-# # Check if a screen session is already running
-# if screen -list | grep -q "MCserver"; then
-#   echo "INFO ! A screen session for the Minecraft server is already running."
-# else
-#   # Start the Minecraft server in a detached screen session
-#   echo "INFO ! Starting Minecraft Server in a screen session."
-#   screen -mS mcserver bash -c 'while true; do
-#     java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
-#     if [ $? -eq 0 ]; then
-#       break
-#     fi
-#   done'
-# fi
-
-while [ true ]; do
-  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -jar $JAR nogui
-  if [ $? -eq 0 ]; then
-    break
-  fi
-done
\ No newline at end of file
diff --git a/testing-fabric/Dockerfile b/testing-fabric/Dockerfile
deleted file mode 100644
index 96fd67a..0000000
--- a/testing-fabric/Dockerfile
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM gitea.fithwum.tech/fithwum/debian-base:bookworm
-LABEL maintainer="fithwum"
-
-# Environment Variables
-ENV ACCEPT_EULA=""
-ENV GAME_PORT=""
-ENV MC_VERSION=""
-ENV FABRIC_VERSION=""
-ENV INSTALLER_VERSION=""
-ENV XMX_SIZE=""
-ENV XMS_SIZE=""
-ENV XMN_SIZE=""
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing-fabric/install_script.sh
-
-# Install Dependencies.
-RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq\
-	&& apt-get -y --fix-broken install \
-	&& apt-get -y autoclean \
-	&& apt-get -y autoremove \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& update-ca-certificates -f;
-
-# Install java
-RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-	&& dpkg -i packages-microsoft-prod.deb \
-	&& apt-get update && apt-get install -y msopenjdk-21 \
-	&& apt-get -y update && apt-get -y --fix-broken install
-
-# Folder creation.
-RUN mkdir -p /MCserver /MCtemp \
-	&& chmod 777 -R /MCserver /MCtemp \
-	&& chown 99:100 -R /MCserver /MCtemp
-
-# Main script
-RUN wget "$INSTALL_SCRIPT" -O /MCtemp/install_script.sh \
-	&& chmod +x /MCtemp/install_script.sh
-
-# Directory where data is stored
-VOLUME /MCserver
-
-# Run command
-CMD [ "/bin/bash", "./MCtemp/install_script.sh" ]
\ No newline at end of file
diff --git a/testing-fabric/build-info.json b/testing-fabric/build-info.json
deleted file mode 100644
index f0311bd..0000000
--- a/testing-fabric/build-info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "version": "testing-fabric",
-  "commit": "e33b177b42cccad6869e64461be53ca8093a3da2",
-  "build_time": "2025-12-20T15:44:22Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:testing-fabric",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:37e044aaf3ce41504b4144bb54cd0586286074aea481dfa242f5da50755cf74b",
-  "image_size": "1GB",
-  "image_size_bytes": 1136086512
-}
diff --git a/testing-fabric/install_script.sh b/testing-fabric/install_script.sh
deleted file mode 100644
index 0b169c4..0000000
--- a/testing-fabric/install_script.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_DIR=/MCserver
-EULA_FILE=$MC_DIR/eula.txt
-EULA_MARKER=$MC_DIR/.eula_accepted
-
-# Main Install Links
-SERVER_FILE=https://meta.fabricmc.net/v2/versions/loader/$MC_VERSION/$FABRIC_VERSION/$INSTALLER_VERSION/server/jar
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/fabric/run.sh
-
-# Main install (Debian).
-# Check for server files and download if needed.
-if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
-	then
-		echo " "
-		echo "INFO ! fabric-$MC_VERSION-$FABRIC_VERSION.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! fabric-$MC_VERSION-$FABRIC_VERSION.jar is out of date/missing ... will download now."
-		echo " "
-		echo "INFO ! Cleaning old files."
-		mkdir $MC_DIR/old-server-versions
-		mv $MC_DIR/fabric-*-*.jar $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
-		chmod +x $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
-fi
-
-# Looking for run.sh
-if [ -e $MC_DIR/run-$MC_VERSION.sh ]
-	then
-		echo " "
-		echo "INFO ! run-$MC_VERSION.sh found ... will use existing file."
-	else
-		echo " "
-		echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will download now."
-		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
-		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
-		chmod +x $MC_DIR/run-$MC_VERSION.sh
-fi
-
-echo "INFO ! Setting game port."
-if [ -f $MC_DIR/server.properties ]; then
-	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
-fi
-
-# Wait briefly for installer/server to generate eula.txt
-if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
-    echo "INFO ! Waiting for EULA generation..."
-    sleep 5
-fi
-
-# If EULA already accepted once, never touch it again
-if [ -f "$EULA_MARKER" ]; then
-    echo "INFO ! EULA previously accepted"
-    return 0 2>/dev/null || true
-fi
-
-# First-time decision
-if [ "$ACCEPT_EULA" = "true" ]; then
-    echo "INFO ! Accepting EULA (one-time)"
-    sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \
-    || echo "eula=true" > "$EULA_FILE"
-    touch "$EULA_MARKER"
-elif [ "$ACCEPT_EULA" = "false" ]; then
-    echo "WARNING ! EULA not accepted on first run"
-    echo "WARNING ! Set ACCEPT_EULA=true to proceed"
-    sleep infinity
-else
-    echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
-    sleep infinity
-fi
-
-# Set permissions.
-chown 99:100 -R $MC_DIR
-chmod 777 -R $MC_DIR
-
-sleep 1
-
-# Run Minecraft server.
-echo " "
-echo "INFO ! Starting Minecraft Server $MC_VERSION"
-exec $MC_DIR/run-$MC_VERSION.sh --dataPath=$MC_DIR
-
-exit
\ No newline at end of file
diff --git a/testing-fabric/run.sh b/testing-fabric/run.sh
deleted file mode 100644
index 1d0fa6c..0000000
--- a/testing-fabric/run.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-cd /MCserver
-JAR=./fabric-*-*.jar
-
-while [ true ]; do
-  java -Xmx$XMX_SIZE -Xms$XMS_SIZE -Xmn$XMN_SIZE -Dbungee.epoll=false -jar $JAR nogui
-  if [ $? -eq 0 ]; then
-    break
-  fi
-done
\ No newline at end of file
diff --git a/testing-forge/CHANGES.md b/testing-forge/CHANGES.md
deleted file mode 100644
index 35e7867..0000000
--- a/testing-forge/CHANGES.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## 2025-12-20T15:42:40Z
-
-- variable fixes (fithwum)
-- EULA test & URL fixes (fithwum)
-- EULA test (fithwum)
diff --git a/testing-forge/Dockerfile b/testing-forge/Dockerfile
deleted file mode 100644
index 6cc3c16..0000000
--- a/testing-forge/Dockerfile
+++ /dev/null
@@ -1,41 +0,0 @@
-FROM gitea.fithwum.tech/fithwum/debian-base:bookworm
-LABEL maintainer="fithwum"
-
-ENV ACCEPT_EULA=""
-ENV GAME_PORT=""
-ENV MC_VERSION=""
-ENV FORGE_VERSION=""
-ENV XMX_SIZE=""
-ENV XMS_SIZE=""
-ENV XMN_SIZE=""
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing-forge/Install_Script.sh
-
-# Install java-17 & Dependencies.
-RUN apt-get -y update && apt-get -y autoclean && apt-get -y autoremove \
-	&& apt-get install -y wget
-RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-	&& dpkg -i packages-microsoft-prod.deb
-RUN apt-get -y update && apt-get -y --fix-broken install \
-	&& apt-get install -y --no-install-recommends msopenjdk-21 bzip2 lsb-release screen jq \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& update-ca-certificates -f;
-
-# Folder creation.
-RUN mkdir -p /MCserver /MCtemp \
-	&& chmod 777 -R /MCserver /MCtemp \
-	&& chown 99:100 -R /MCserver /MCtemp \
-	&& cd /MCserver
-
-ADD "$INSTALL_SCRIPT" /MCtemp
-RUN chmod +x /MCtemp/Install_Script.sh
-
-# Directory where data is stored
-VOLUME /MCserver
-
-# 25565 Default.
-EXPOSE 25565/udp 25565/tcp
-
-# Run command
-CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ]
diff --git a/testing-forge/Install_Script.sh b/testing-forge/Install_Script.sh
deleted file mode 100644
index 476303c..0000000
--- a/testing-forge/Install_Script.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_DIR=/MCserver
-EULA_FILE=$MC_DIR/eula.txt
-EULA_MARKER=$MC_DIR/.eula_accepted
-
-# Main Install Links
-INSTALLER_FILE=https://maven.minecraftforge.net/net/minecraftforge/forge/$MC_VERSION-$FORGE_VERSION/forge-$MC_VERSION-$FORGE_VERSION-installer.jar
-MC_RUN_FILE=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/neoforged/run.sh
-
-# Main install (Debian).
-# Check for server files and download if needed.
-if [ -e $MC_DIR/forge-$MC_VERSION-$FORGE_VERSION-installer.jar ]
-	then
-		echo " "
-		echo "INFO ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! forge-$MC_VERSION-$FORGE_VERSION-installer.jar is out of date/missing ... will download now."
-		echo " "
-		echo "INFO ! Cleaning old files."
-		cd $MC_DIR
-		rm -fr neoforge-*.jar run-*.sh /libraries
-		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O forge-$MC_VERSION-$FORGE_VERSION-installer.jar
-		chmod +x forge-$MC_VERSION-$FORGE_VERSION-installer.jar
-		java -jar forge-$MC_VERSION-$FORGE_VERSION-installer.jar --installServer
-		mv run.sh run-$MC_VERSION-$FORGE_VERSION.sh
-		chmod +x run-$MC_VERSION-$FORGE_VERSION.sh
-		cd ..
-fi
-
-echo "INFO ! Setting game port."
-if [ -f $MC_DIR/server.properties ]; then
-	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
-fi
-
-echo "INFO ! Setting java settings."
-cat > $MC_DIR/user_jvm_args.txt <<EOF
--Xmx${XMX_SIZE}
--Xms${XMS_SIZE}
-EOF
-[ -n "$XMN_SIZE" ] && echo "-Xmn${XMN_SIZE}" >> $MC_DIR/user_jvm_args.txt
-
-# Wait briefly for installer/server to generate eula.txt
-if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
-    echo "INFO ! Waiting for EULA generation..."
-    sleep 5
-fi
-
-# If EULA already accepted once, never touch it again
-if [ -f "$EULA_MARKER" ]; then
-    echo "INFO ! EULA previously accepted"
-    return 0 2>/dev/null || true
-fi
-
-# First-time decision
-if [ "$ACCEPT_EULA" = "true" ]; then
-    echo "INFO ! Accepting EULA (one-time)"
-    sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \
-    || echo "eula=true" > "$EULA_FILE"
-    touch "$EULA_MARKER"
-elif [ "$ACCEPT_EULA" = "false" ]; then
-    echo "WARNING ! EULA not accepted on first run"
-    echo "WARNING ! Set ACCEPT_EULA=true to proceed"
-    sleep infinity
-else
-    echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
-    sleep infinity
-fi
-
-# Set permissions.
-chown 99:100 -R $MC_DIR
-chmod 777 -R $MC_DIR
-
-sleep 1
-
-# Run Minecraft server.
-echo " "
-echo "INFO ! Starting Minecraft Server $MC_VERSION-$FORGE_VERSION"
-cd $MC_DIR
-exec ./run-$MC_VERSION-$FORGE_VERSION.sh nogui
-
-exit
\ No newline at end of file
diff --git a/testing-forge/build-info.json b/testing-forge/build-info.json
deleted file mode 100644
index 8e4a891..0000000
--- a/testing-forge/build-info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "version": "testing-forge",
-  "commit": "e33b177b42cccad6869e64461be53ca8093a3da2",
-  "build_time": "2025-12-20T15:45:47Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:testing-forge",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:c4922e80600ea0109d2567c9195b7b1489fdbc74dee1ddc05e2a81fa0286b19c",
-  "image_size": "1GB",
-  "image_size_bytes": 1107642656
-}
diff --git a/testing-neoforged/CHANGES.md b/testing-neoforged/CHANGES.md
deleted file mode 100644
index 35e7867..0000000
--- a/testing-neoforged/CHANGES.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## 2025-12-20T15:42:40Z
-
-- variable fixes (fithwum)
-- EULA test & URL fixes (fithwum)
-- EULA test (fithwum)
diff --git a/testing-neoforged/Dockerfile b/testing-neoforged/Dockerfile
deleted file mode 100644
index 39dd77c..0000000
--- a/testing-neoforged/Dockerfile
+++ /dev/null
@@ -1,40 +0,0 @@
-FROM gitea.fithwum.tech/fithwum/debian-base:bookworm
-LABEL maintainer="fithwum"
-
-ENV ACCEPT_EULA=""
-ENV GAME_PORT=""
-ENV NEOFORGED_VERSION=""
-ENV XMX_SIZE=""
-ENV XMS_SIZE=""
-ENV XMN_SIZE=""
-
-# URL's for files
-ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/master/testing-neoforged/Install_Script.sh
-
-# Install java-17 & Dependencies.
-RUN apt-get -y update && apt-get -y autoclean && apt-get -y autoremove \
-	&& apt-get install -y wget
-RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-	&& dpkg -i packages-microsoft-prod.deb
-RUN apt-get -y update && apt-get -y --fix-broken install \
-	&& apt-get install -y --no-install-recommends msopenjdk-21 bzip2 lsb-release screen jq \
-	&& rm -rf /var/lib/apt/lists/* \
-	&& update-ca-certificates -f;
-
-# Folder creation.
-RUN mkdir -p /MCserver /MCtemp \
-	&& chmod 777 -R /MCserver /MCtemp \
-	&& chown 99:100 -R /MCserver /MCtemp \
-	&& cd /MCserver
-
-ADD "$INSTALL_SCRIPT" /MCtemp
-RUN chmod +x /MCtemp/Install_Script.sh
-
-# Directory where data is stored
-VOLUME /MCserver
-
-# 25565 Default.
-EXPOSE 25565/udp 25565/tcp
-
-# Run command
-CMD [ "/bin/bash", "./MCtemp/Install_Script.sh" ]
diff --git a/testing-neoforged/Install_Script.sh b/testing-neoforged/Install_Script.sh
deleted file mode 100644
index 9ef4efc..0000000
--- a/testing-neoforged/Install_Script.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2022 fithwum
-# All rights reserved
-
-MC_DIR=/MCserver
-EULA_FILE=$MC_DIR/eula.txt
-EULA_MARKER=$MC_DIR/.eula_accepted
-
-# Main Install Links
-INSTALLER_FILE=https://maven.neoforged.net/releases/net/neoforged/neoforge/$NEOFORGED_VERSION/neoforge-$NEOFORGED_VERSION-installer.jar
-
-# Main install (Debian).
-# Check for server files and download if needed.
-if [ -e $MC_DIR/neoforge-$NEOFORGED_VERSION-installer.jar ]
-	then
-		echo " "
-		echo "INFO ! neoforge-$NEOFORGED_VERSION-installer.jar found starting now."
-	else
-		echo " "
-		echo "WARNING ! neoforge-$NEOFORGED_VERSION-installer.jar is out of date/missing ... will download now."
-		echo " "
-		echo "INFO ! Cleaning old files."
-		cd $MC_DIR
-		rm -fr neoforge-*.jar run-*.sh /libraries
-		wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O neoforge-$NEOFORGED_VERSION-installer.jar
-		chmod +x neoforge-$NEOFORGED_VERSION-installer.jar
-		java -jar neoforge-$NEOFORGED_VERSION-installer.jar --installServer
-		mv run.sh run-$NEOFORGED_VERSION.sh
-		chmod +x run-$NEOFORGED_VERSION.sh
-		cd ..
-fi
-
-echo "INFO ! Setting game port."
-if [ -f $MC_DIR/server.properties ]; then
-	sed -i '/server-port='*'/c\server-port='$GAME_PORT'' $MC_DIR/server.properties
-fi
-
-echo "INFO ! Setting java settings."
-cat > $MC_DIR/user_jvm_args.txt <<EOF
--Xmx${XMX_SIZE}
--Xms${XMS_SIZE}
-EOF
-[ -n "$XMN_SIZE" ] && echo "-Xmn${XMN_SIZE}" >> $MC_DIR/user_jvm_args.txt
-
-# Wait briefly for installer/server to generate eula.txt
-if [ ! -f "$EULA_FILE" ] && [ ! -f "$EULA_MARKER" ]; then
-    echo "INFO ! Waiting for EULA generation..."
-    sleep 5
-fi
-
-# If EULA already accepted once, never touch it again
-if [ -f "$EULA_MARKER" ]; then
-    echo "INFO ! EULA previously accepted"
-    return 0 2>/dev/null || true
-fi
-
-# First-time decision
-if [ "$ACCEPT_EULA" = "true" ]; then
-    echo "INFO ! Accepting EULA (one-time)"
-    sed -i 's/eula=false/eula=true/' "$EULA_FILE" 2>/dev/null \
-    || echo "eula=true" > "$EULA_FILE"
-    touch "$EULA_MARKER"
-elif [ "$ACCEPT_EULA" = "false" ]; then
-    echo "WARNING ! EULA not accepted on first run"
-    echo "WARNING ! Set ACCEPT_EULA=true to proceed"
-    sleep infinity
-else
-    echo "ERROR ! ACCEPT_EULA must be set to true or false on first run"
-    sleep infinity
-fi
-
-# Set permissions.
-chown 99:100 -R $MC_DIR
-chmod 777 -R $MC_DIR
-
-sleep 1
-
-# Run Minecraft server.
-echo " "
-echo "INFO ! Starting Minecraft Server $NEOFORGED_VERSION"
-cd $MC_DIR
-exec ./run-$NEOFORGED_VERSION.sh nogui
-
-exit
\ No newline at end of file
diff --git a/testing-neoforged/build-info.json b/testing-neoforged/build-info.json
deleted file mode 100644
index 7964d4b..0000000
--- a/testing-neoforged/build-info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "version": "testing-neoforged",
-  "commit": "e33b177b42cccad6869e64461be53ca8093a3da2",
-  "build_time": "2025-12-20T15:44:50Z",
-  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:testing-neoforged",
-  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:236fce4297ad5d8aa7b8a064f4ee7d9c236d64ccdb5173adc3c72d1be15c8110",
-  "image_size": "1GB",
-  "image_size_bytes": 1107624306
-}
diff --git a/testing-vanilla/CHANGES.md b/testing-vanilla/CHANGES.md
deleted file mode 100644
index 35e7867..0000000
--- a/testing-vanilla/CHANGES.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## 2025-12-20T15:42:40Z
-
-- variable fixes (fithwum)
-- EULA test & URL fixes (fithwum)
-- EULA test (fithwum)
diff --git a/testing-vanilla/test.sh b/testing-vanilla/test.sh
deleted file mode 100755
index a01be6e..0000000
--- a/testing-vanilla/test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2023 fithwum
-# All rights reserved
-
-MC_VERSION="1.14.4"
-
-VERSION_CHECK=$(curl -s "https://piston-meta.mojang.com/mc/game/version_manifest_v2.json" | grep -Pom 1 '"url": "\K[^"]*'$MC_VERSION'.json')
-MC_SERVER_FILE=$(curl -s $VERSION_CHECK | jq --raw-output '.downloads.server.url')
-
-echo "Server url: $MC_SERVER_FILE"
-
-wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O /mnt/Other/Dockers/minecraft/testing/server-$MC_VERSION.jar
\ No newline at end of file
diff --git a/testing-fabric/CHANGES.md b/testing/CHANGES.md
similarity index 100%
rename from testing-fabric/CHANGES.md
rename to testing/CHANGES.md
diff --git a/testing-vanilla/Dockerfile b/testing/Dockerfile
similarity index 70%
rename from testing-vanilla/Dockerfile
rename to testing/Dockerfile
index a6db812..827e71e 100644
--- a/testing-vanilla/Dockerfile
+++ b/testing/Dockerfile
@@ -1,4 +1,4 @@
-FROM gitea.fithwum.tech/fithwum/debian-base:bookworm
+FROM gitea.fithwum.tech/fithwum/debian-base:trixie
 LABEL maintainer="fithwum"
 
 # Environment Variables
@@ -14,7 +14,7 @@ ARG INSTALL_SCRIPT=https://gitea.fithwum.tech/fithwum/minecraft/raw/branch/maste
 
 # Install Dependencies.
 RUN apt-get -y update \
-	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq \
+	&& apt-get install -y --no-install-recommends bzip2 lsb-release screen jq openjdk-21-jdk-headless \
 	&& apt-get -y --fix-broken install \
 	&& apt-get -y autoclean \
 	&& apt-get -y autoremove \
@@ -22,10 +22,10 @@ RUN apt-get -y update \
 	&& update-ca-certificates -f;
 
 # Install java
-RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
-	&& dpkg -i packages-microsoft-prod.deb \
-	&& apt-get update && apt-get install -y msopenjdk-21 \
-	&& apt-get -y update && apt-get -y --fix-broken install
+# RUN wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+# 	&& dpkg -i packages-microsoft-prod.deb \
+# 	&& apt-get update && apt-get install -y msopenjdk-21 \
+# 	&& apt-get -y update && apt-get -y --fix-broken install
 
 # Folder creation.
 RUN mkdir -p /MCserver /MCtemp \
diff --git a/testing-vanilla/Script/restart.sh b/testing/Script/restart.sh
similarity index 100%
rename from testing-vanilla/Script/restart.sh
rename to testing/Script/restart.sh
diff --git a/testing-vanilla/Script/start.sh b/testing/Script/start.sh
similarity index 100%
rename from testing-vanilla/Script/start.sh
rename to testing/Script/start.sh
diff --git a/testing-vanilla/build-info.json b/testing/build-info.json
similarity index 100%
rename from testing-vanilla/build-info.json
rename to testing/build-info.json
diff --git a/testing-vanilla/install_script.sh b/testing/install_script.sh
similarity index 99%
rename from testing-vanilla/install_script.sh
rename to testing/install_script.sh
index 702efb0..a5277b6 100644
--- a/testing-vanilla/install_script.sh
+++ b/testing/install_script.sh
@@ -23,7 +23,6 @@ if [ -e $MC_DIR/MCserver-$MC_VERSION.jar ]
 		echo "INFO ! Cleaning old files."
 		mkdir $MC_DIR/old-server-versions/
 		mv $MC_DIR/MCserver-*.jar $MC_DIR/old-server-versions/
-		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O $MC_DIR/MCserver-$MC_VERSION.jar
 		chmod +x $MC_DIR/MCserver-$MC_VERSION.jar
 fi
@@ -36,7 +35,7 @@ if [ -e $MC_DIR/run-$MC_VERSION.sh ]
 	else
 		echo " "
 		echo "WARNING ! run.sh is out of date/missing ... will download now."
-		rm -fr $MC_DIR/run_*.sh
+		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
 		chmod +x $MC_DIR/run-$MC_VERSION.sh
 fi
diff --git a/testing-vanilla/run.sh b/testing/run.sh
similarity index 100%
rename from testing-vanilla/run.sh
rename to testing/run.sh
diff --git a/testing-vanilla/server.properties b/testing/server.properties
similarity index 100%
rename from testing-vanilla/server.properties
rename to testing/server.properties
diff --git a/testing-bukkit/test.sh b/testing/test.sh
similarity index 100%
rename from testing-bukkit/test.sh
rename to testing/test.sh
diff --git a/vanilla/install_script.sh b/vanilla/install_script.sh
index 702efb0..a5277b6 100644
--- a/vanilla/install_script.sh
+++ b/vanilla/install_script.sh
@@ -23,7 +23,6 @@ if [ -e $MC_DIR/MCserver-$MC_VERSION.jar ]
 		echo "INFO ! Cleaning old files."
 		mkdir $MC_DIR/old-server-versions/
 		mv $MC_DIR/MCserver-*.jar $MC_DIR/old-server-versions/
-		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O $MC_DIR/MCserver-$MC_VERSION.jar
 		chmod +x $MC_DIR/MCserver-$MC_VERSION.jar
 fi
@@ -36,7 +35,7 @@ if [ -e $MC_DIR/run-$MC_VERSION.sh ]
 	else
 		echo " "
 		echo "WARNING ! run.sh is out of date/missing ... will download now."
-		rm -fr $MC_DIR/run_*.sh
+		mv $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
 		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O $MC_DIR/run-$MC_VERSION.sh
 		chmod +x $MC_DIR/run-$MC_VERSION.sh
 fi