diff --git a/.gitea/workflows/base-build.yml b/.gitea/workflows/base-build.yml
index 12dc8d8..7dec834 100644
--- a/.gitea/workflows/base-build.yml
+++ b/.gitea/workflows/base-build.yml
@@ -20,7 +20,7 @@ env:
   IMAGE_REPO_MINECRAFT: minecraft
   IMAGE_TAG_DEBIAN: bookworm
   DIGEST_FILE: .cache/debian-base.digest
-  VERSIONS: vanilla testing fabric
+  VERSIONS: vanilla testing-vanilla fabric testing-fabric
 
 jobs:
   poll-debian-base-and-detect-changes:
@@ -88,7 +88,7 @@ jobs:
     if: needs.poll-debian-base-and-detect-changes.outputs.digest_changed == 'true' || needs.poll-debian-base-and-detect-changes.outputs.versions_changed != ''
     strategy:
       matrix:
-        version: [vanilla, testing, fabric]
+        version: [vanilla, testing-vanilla, fabric, testing-fabric]
     name: Build and Push ${{ matrix.version }}
     steps:
       - name: Checkout repo
diff --git a/testing-fabric/CHANGES.md b/testing-fabric/CHANGES.md
new file mode 100644
index 0000000..8f21e81
--- /dev/null
+++ b/testing-fabric/CHANGES.md
@@ -0,0 +1,5 @@
+## 2025-07-10T19:15:25Z
+
+- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:16c677d72657174954fab4d618bd994ff0fb6ee0bcca5f0cbaf28bae85e107c9 (fithwum)
+- test (fithwum)
+- Update changelog for fabric (fithwum)
diff --git a/testing-fabric/Dockerfile b/testing-fabric/Dockerfile
new file mode 100644
index 0000000..762a0d8
--- /dev/null
+++ b/testing-fabric/Dockerfile
@@ -0,0 +1,45 @@
+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/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
new file mode 100644
index 0000000..d6d96d8
--- /dev/null
+++ b/testing-fabric/build-info.json
@@ -0,0 +1,9 @@
+{
+  "version": "fabric",
+  "commit": "b5acb1975cc81332aa4f35bc6fd7b04e2ea87fde",
+  "build_time": "2025-07-10T19:15:33Z",
+  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:fabric",
+  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:0ed1cefb5ac104cc2e054264f2a8c0d8519d85aebb8d72124bf8066963d127ab",
+  "image_size": "1GB",
+  "image_size_bytes": 1133710022
+}
diff --git a/testing-fabric/install_script.sh b/testing-fabric/install_script.sh
new file mode 100644
index 0000000..61a4611
--- /dev/null
+++ b/testing-fabric/install_script.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+# Copyright (c) 2022 fithwum
+# All rights reserved
+
+# 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
+
+rm -fr /MCserver/run_*.sh
+
+# Main install (Debian).
+# Check for server files and download if needed.
+if [ -e /MCserver/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 /MCserver/old-server-versions
+			mv /MCserver/fabric-*-*.jar /MCserver/old-server-versions/
+			wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
+fi
+
+sleep 1
+
+# Looking for run.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-$MC_VERSION.sh is out of date/missing ... will download now."
+		mv /MCserver/run-*.sh /MCserver/old-server-versions/
+		wget --no-cache --show-progress --progress=bar:force:noscroll $MC_RUN_FILE -O /MCserver/run-$MC_VERSION.sh
+fi
+
+# Check for EULA
+if [ ! -f /MCserver/eula.txt ]; then
+	:
+else
+	if [ "$ACCEPT_EULA" == "false" ]; then
+		if grep -rq 'eula=true' /MCserver/eula.txt; then
+			sed -i '/eula=true/c\eula=false' /MCserver/eula.txt
+		fi
+			echo " "
+			echo "WARNING ! EULA not accepted, you must accept the EULA"
+			echo "			to start the Server, putting server in sleep mode"
+		sleep infinity
+    fi
+fi
+
+sleep 1
+
+if [ ! -f /MCserver/eula.txt ]; then
+	echo " "
+	echo "WARNING ! EULA not found please stand by..."
+	sleep 5
+fi
+if [ "$ACCEPT_EULA" == "true" ]; then
+	if grep -rq 'eula=false' /MCserver/eula.txt; then
+		sed -i '/eula=false/c\eula=true' /MCserver/eula.txt
+		echo " "
+		echo "INFO ! EULA accepted, server restarting, please wait..."
+		sleep 1
+		exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
+		exit 0
+	fi
+elif [ "$ACCEPT_EULA" == "false" ]; then
+	echo " "
+	echo "WARNING ! EULA not accepted, you must accept the EULA"
+	echo "			to start the Server, putting server in sleep mode"
+	sleep infinity
+else
+	echo " "
+	echo "WARNING ! Something went wrong, please check EULA variable"
+fi
+
+sleep 1
+echo "INFO ! Setting game port."
+sed -i '/server-port='*'/c\server-port='$GAME_PORT'' /MCserver/server.properties
+sleep 1
+
+# Set permissions.
+chown 99:100 -R /MCserver
+chmod 777 -R /MCserver
+chmod +x /MCserver/run-$MC_VERSION.sh
+chmod +x /MCserver/fabric-$MC_VERSION-$FABRIC_VERSION.jar
+
+sleep 1
+
+# Run Minecraft server.
+echo " "
+echo "INFO ! Starting Minecraft Server $MC_VERSION"
+exec /MCserver/run-$MC_VERSION.sh --dataPath=/MCserver
+
+exit
\ No newline at end of file
diff --git a/testing-fabric/run.sh b/testing-fabric/run.sh
new file mode 100644
index 0000000..1d0fa6c
--- /dev/null
+++ b/testing-fabric/run.sh
@@ -0,0 +1,13 @@
+#!/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-vanilla/CHANGES.md b/testing-vanilla/CHANGES.md
new file mode 100644
index 0000000..8f21e81
--- /dev/null
+++ b/testing-vanilla/CHANGES.md
@@ -0,0 +1,5 @@
+## 2025-07-10T19:15:25Z
+
+- Update base digest to gitea.fithwum.tech/fithwum/debian-base@sha256:16c677d72657174954fab4d618bd994ff0fb6ee0bcca5f0cbaf28bae85e107c9 (fithwum)
+- test (fithwum)
+- Update changelog for fabric (fithwum)
diff --git a/testing/Dockerfile b/testing-vanilla/Dockerfile
similarity index 100%
rename from testing/Dockerfile
rename to testing-vanilla/Dockerfile
diff --git a/testing/Script/restart.sh b/testing-vanilla/Script/restart.sh
similarity index 100%
rename from testing/Script/restart.sh
rename to testing-vanilla/Script/restart.sh
diff --git a/testing/Script/start.sh b/testing-vanilla/Script/start.sh
similarity index 100%
rename from testing/Script/start.sh
rename to testing-vanilla/Script/start.sh
diff --git a/testing-vanilla/build-info.json b/testing-vanilla/build-info.json
new file mode 100644
index 0000000..99f30a9
--- /dev/null
+++ b/testing-vanilla/build-info.json
@@ -0,0 +1,9 @@
+{
+  "version": "testing",
+  "commit": "b5acb1975cc81332aa4f35bc6fd7b04e2ea87fde",
+  "build_time": "2025-07-10T19:15:33Z",
+  "image_tag": "gitea.fithwum.tech/fithwum/minecraft:testing",
+  "digest": "gitea.fithwum.tech/fithwum/minecraft@sha256:cdeaeaddf07539bc9c171c8d237996dc7d50826d5c8f6b3ebc2bd226f06681da",
+  "image_size": "1GB",
+  "image_size_bytes": 1133710188
+}
diff --git a/testing/install_script.sh b/testing-vanilla/install_script.sh
similarity index 100%
rename from testing/install_script.sh
rename to testing-vanilla/install_script.sh
diff --git a/testing/run.sh b/testing-vanilla/run.sh
similarity index 100%
rename from testing/run.sh
rename to testing-vanilla/run.sh
diff --git a/testing/server.properties b/testing-vanilla/server.properties
similarity index 100%
rename from testing/server.properties
rename to testing-vanilla/server.properties
diff --git a/testing/test.sh b/testing-vanilla/test.sh
similarity index 100%
rename from testing/test.sh
rename to testing-vanilla/test.sh