diff --git a/PterodactylImages/Ridged-Java22/Dockerfile b/PterodactylImages/Minecraft-Paper/Ridged-Java11/Dockerfile
similarity index 89%
rename from PterodactylImages/Ridged-Java22/Dockerfile
rename to PterodactylImages/Minecraft-Paper/Ridged-Java11/Dockerfile
index d22a921..04a4509 100644
--- a/PterodactylImages/Ridged-Java22/Dockerfile
+++ b/PterodactylImages/Minecraft-Paper/Ridged-Java11/Dockerfile
@@ -1,7 +1,7 @@
 FROM eclipse-temurin:22-jammy
 
 LABEL author="PixelRidge Softworks" maintainer="connor@pixelridgesoftworks.com"
-LABEL org.opencontainers.image.source="https://github.com/Software-Noob/pterodactyl-images"
+LABEL org.opencontainers.image.source="https://git.pixelridgesoftworks.com/PixelRidge-Softworks/DockerImages/src/branch/main/PterodactylImages"
 LABEL org.opencontainers.image.licenses="MIT"
 
 RUN apt-get update -y \
diff --git a/PterodactylImages/Minecraft-Paper/Ridged-Java16/Dockerfile b/PterodactylImages/Minecraft-Paper/Ridged-Java16/Dockerfile
new file mode 100644
index 0000000..04a4509
--- /dev/null
+++ b/PterodactylImages/Minecraft-Paper/Ridged-Java16/Dockerfile
@@ -0,0 +1,34 @@
+FROM eclipse-temurin:22-jammy
+
+LABEL author="PixelRidge Softworks" maintainer="connor@pixelridgesoftworks.com"
+LABEL org.opencontainers.image.source="https://git.pixelridgesoftworks.com/PixelRidge-Softworks/DockerImages/src/branch/main/PterodactylImages"
+LABEL org.opencontainers.image.licenses="MIT"
+
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 libstdc++6 lsof build-essential tzdata iproute2 locales \
+    && apt-get install -y openjdk-8-jdk openjdk-11-jdk openjdk-16-jdk openjdk-17-jdk \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && useradd -m -d /home/container container \
+    && locale-gen en_US.UTF-8
+
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US.UTF-8
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+# Create a script to set the JAVA_HOME and update-alternatives based on an environment variable
+RUN echo '#!/bin/bash\n\
+if [ -n "$JAVA_VERSION" ]; then\n\
+  update-alternatives --set java /usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64/bin/java\n\
+  export JAVA_HOME=/usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64\n\
+fi\n\
+ip link set lo up\n\
+exec /entrypoint.sh' > /start.sh \
+&& chmod +x /start.sh
+
+COPY ./entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/bin/bash", "/start.sh"]
diff --git a/PterodactylImages/Minecraft-Paper/Ridged-Java17/Dockerfile b/PterodactylImages/Minecraft-Paper/Ridged-Java17/Dockerfile
new file mode 100644
index 0000000..04a4509
--- /dev/null
+++ b/PterodactylImages/Minecraft-Paper/Ridged-Java17/Dockerfile
@@ -0,0 +1,34 @@
+FROM eclipse-temurin:22-jammy
+
+LABEL author="PixelRidge Softworks" maintainer="connor@pixelridgesoftworks.com"
+LABEL org.opencontainers.image.source="https://git.pixelridgesoftworks.com/PixelRidge-Softworks/DockerImages/src/branch/main/PterodactylImages"
+LABEL org.opencontainers.image.licenses="MIT"
+
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 libstdc++6 lsof build-essential tzdata iproute2 locales \
+    && apt-get install -y openjdk-8-jdk openjdk-11-jdk openjdk-16-jdk openjdk-17-jdk \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && useradd -m -d /home/container container \
+    && locale-gen en_US.UTF-8
+
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US.UTF-8
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+# Create a script to set the JAVA_HOME and update-alternatives based on an environment variable
+RUN echo '#!/bin/bash\n\
+if [ -n "$JAVA_VERSION" ]; then\n\
+  update-alternatives --set java /usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64/bin/java\n\
+  export JAVA_HOME=/usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64\n\
+fi\n\
+ip link set lo up\n\
+exec /entrypoint.sh' > /start.sh \
+&& chmod +x /start.sh
+
+COPY ./entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/bin/bash", "/start.sh"]
diff --git a/PterodactylImages/Minecraft-Paper/Ridged-Java18/Dockerfile b/PterodactylImages/Minecraft-Paper/Ridged-Java18/Dockerfile
new file mode 100644
index 0000000..04a4509
--- /dev/null
+++ b/PterodactylImages/Minecraft-Paper/Ridged-Java18/Dockerfile
@@ -0,0 +1,34 @@
+FROM eclipse-temurin:22-jammy
+
+LABEL author="PixelRidge Softworks" maintainer="connor@pixelridgesoftworks.com"
+LABEL org.opencontainers.image.source="https://git.pixelridgesoftworks.com/PixelRidge-Softworks/DockerImages/src/branch/main/PterodactylImages"
+LABEL org.opencontainers.image.licenses="MIT"
+
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 libstdc++6 lsof build-essential tzdata iproute2 locales \
+    && apt-get install -y openjdk-8-jdk openjdk-11-jdk openjdk-16-jdk openjdk-17-jdk \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && useradd -m -d /home/container container \
+    && locale-gen en_US.UTF-8
+
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US.UTF-8
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+# Create a script to set the JAVA_HOME and update-alternatives based on an environment variable
+RUN echo '#!/bin/bash\n\
+if [ -n "$JAVA_VERSION" ]; then\n\
+  update-alternatives --set java /usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64/bin/java\n\
+  export JAVA_HOME=/usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64\n\
+fi\n\
+ip link set lo up\n\
+exec /entrypoint.sh' > /start.sh \
+&& chmod +x /start.sh
+
+COPY ./entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/bin/bash", "/start.sh"]
diff --git a/PterodactylImages/Minecraft-Paper/Ridged-Java19/Dockerfile b/PterodactylImages/Minecraft-Paper/Ridged-Java19/Dockerfile
new file mode 100644
index 0000000..04a4509
--- /dev/null
+++ b/PterodactylImages/Minecraft-Paper/Ridged-Java19/Dockerfile
@@ -0,0 +1,34 @@
+FROM eclipse-temurin:22-jammy
+
+LABEL author="PixelRidge Softworks" maintainer="connor@pixelridgesoftworks.com"
+LABEL org.opencontainers.image.source="https://git.pixelridgesoftworks.com/PixelRidge-Softworks/DockerImages/src/branch/main/PterodactylImages"
+LABEL org.opencontainers.image.licenses="MIT"
+
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 libstdc++6 lsof build-essential tzdata iproute2 locales \
+    && apt-get install -y openjdk-8-jdk openjdk-11-jdk openjdk-16-jdk openjdk-17-jdk \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && useradd -m -d /home/container container \
+    && locale-gen en_US.UTF-8
+
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US.UTF-8
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+# Create a script to set the JAVA_HOME and update-alternatives based on an environment variable
+RUN echo '#!/bin/bash\n\
+if [ -n "$JAVA_VERSION" ]; then\n\
+  update-alternatives --set java /usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64/bin/java\n\
+  export JAVA_HOME=/usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64\n\
+fi\n\
+ip link set lo up\n\
+exec /entrypoint.sh' > /start.sh \
+&& chmod +x /start.sh
+
+COPY ./entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/bin/bash", "/start.sh"]
diff --git a/PterodactylImages/Minecraft-Paper/Ridged-Java20/Dockerfile b/PterodactylImages/Minecraft-Paper/Ridged-Java20/Dockerfile
new file mode 100644
index 0000000..04a4509
--- /dev/null
+++ b/PterodactylImages/Minecraft-Paper/Ridged-Java20/Dockerfile
@@ -0,0 +1,34 @@
+FROM eclipse-temurin:22-jammy
+
+LABEL author="PixelRidge Softworks" maintainer="connor@pixelridgesoftworks.com"
+LABEL org.opencontainers.image.source="https://git.pixelridgesoftworks.com/PixelRidge-Softworks/DockerImages/src/branch/main/PterodactylImages"
+LABEL org.opencontainers.image.licenses="MIT"
+
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 libstdc++6 lsof build-essential tzdata iproute2 locales \
+    && apt-get install -y openjdk-8-jdk openjdk-11-jdk openjdk-16-jdk openjdk-17-jdk \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && useradd -m -d /home/container container \
+    && locale-gen en_US.UTF-8
+
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US.UTF-8
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+# Create a script to set the JAVA_HOME and update-alternatives based on an environment variable
+RUN echo '#!/bin/bash\n\
+if [ -n "$JAVA_VERSION" ]; then\n\
+  update-alternatives --set java /usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64/bin/java\n\
+  export JAVA_HOME=/usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64\n\
+fi\n\
+ip link set lo up\n\
+exec /entrypoint.sh' > /start.sh \
+&& chmod +x /start.sh
+
+COPY ./entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/bin/bash", "/start.sh"]
diff --git a/PterodactylImages/Minecraft-Paper/Ridged-Java21/Dockerfile b/PterodactylImages/Minecraft-Paper/Ridged-Java21/Dockerfile
new file mode 100644
index 0000000..04a4509
--- /dev/null
+++ b/PterodactylImages/Minecraft-Paper/Ridged-Java21/Dockerfile
@@ -0,0 +1,34 @@
+FROM eclipse-temurin:22-jammy
+
+LABEL author="PixelRidge Softworks" maintainer="connor@pixelridgesoftworks.com"
+LABEL org.opencontainers.image.source="https://git.pixelridgesoftworks.com/PixelRidge-Softworks/DockerImages/src/branch/main/PterodactylImages"
+LABEL org.opencontainers.image.licenses="MIT"
+
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 libstdc++6 lsof build-essential tzdata iproute2 locales \
+    && apt-get install -y openjdk-8-jdk openjdk-11-jdk openjdk-16-jdk openjdk-17-jdk \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && useradd -m -d /home/container container \
+    && locale-gen en_US.UTF-8
+
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US.UTF-8
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+# Create a script to set the JAVA_HOME and update-alternatives based on an environment variable
+RUN echo '#!/bin/bash\n\
+if [ -n "$JAVA_VERSION" ]; then\n\
+  update-alternatives --set java /usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64/bin/java\n\
+  export JAVA_HOME=/usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64\n\
+fi\n\
+ip link set lo up\n\
+exec /entrypoint.sh' > /start.sh \
+&& chmod +x /start.sh
+
+COPY ./entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/bin/bash", "/start.sh"]
diff --git a/PterodactylImages/Minecraft-Paper/Ridged-Java22/Dockerfile b/PterodactylImages/Minecraft-Paper/Ridged-Java22/Dockerfile
new file mode 100644
index 0000000..04a4509
--- /dev/null
+++ b/PterodactylImages/Minecraft-Paper/Ridged-Java22/Dockerfile
@@ -0,0 +1,34 @@
+FROM eclipse-temurin:22-jammy
+
+LABEL author="PixelRidge Softworks" maintainer="connor@pixelridgesoftworks.com"
+LABEL org.opencontainers.image.source="https://git.pixelridgesoftworks.com/PixelRidge-Softworks/DockerImages/src/branch/main/PterodactylImages"
+LABEL org.opencontainers.image.licenses="MIT"
+
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 libstdc++6 lsof build-essential tzdata iproute2 locales \
+    && apt-get install -y openjdk-8-jdk openjdk-11-jdk openjdk-16-jdk openjdk-17-jdk \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && useradd -m -d /home/container container \
+    && locale-gen en_US.UTF-8
+
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US.UTF-8
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+# Create a script to set the JAVA_HOME and update-alternatives based on an environment variable
+RUN echo '#!/bin/bash\n\
+if [ -n "$JAVA_VERSION" ]; then\n\
+  update-alternatives --set java /usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64/bin/java\n\
+  export JAVA_HOME=/usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64\n\
+fi\n\
+ip link set lo up\n\
+exec /entrypoint.sh' > /start.sh \
+&& chmod +x /start.sh
+
+COPY ./entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/bin/bash", "/start.sh"]
diff --git a/PterodactylImages/Minecraft-Paper/Ridged-Java8/Dockerfile b/PterodactylImages/Minecraft-Paper/Ridged-Java8/Dockerfile
new file mode 100644
index 0000000..04a4509
--- /dev/null
+++ b/PterodactylImages/Minecraft-Paper/Ridged-Java8/Dockerfile
@@ -0,0 +1,34 @@
+FROM eclipse-temurin:22-jammy
+
+LABEL author="PixelRidge Softworks" maintainer="connor@pixelridgesoftworks.com"
+LABEL org.opencontainers.image.source="https://git.pixelridgesoftworks.com/PixelRidge-Softworks/DockerImages/src/branch/main/PterodactylImages"
+LABEL org.opencontainers.image.licenses="MIT"
+
+RUN apt-get update -y \
+    && apt-get install -y --no-install-recommends curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 libstdc++6 lsof build-essential tzdata iproute2 locales \
+    && apt-get install -y openjdk-8-jdk openjdk-11-jdk openjdk-16-jdk openjdk-17-jdk \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && useradd -m -d /home/container container \
+    && locale-gen en_US.UTF-8
+
+ENV LC_ALL=en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US.UTF-8
+
+USER container
+ENV USER=container HOME=/home/container
+WORKDIR /home/container
+
+# Create a script to set the JAVA_HOME and update-alternatives based on an environment variable
+RUN echo '#!/bin/bash\n\
+if [ -n "$JAVA_VERSION" ]; then\n\
+  update-alternatives --set java /usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64/bin/java\n\
+  export JAVA_HOME=/usr/lib/jvm/java-$JAVA_VERSION-openjdk-amd64\n\
+fi\n\
+ip link set lo up\n\
+exec /entrypoint.sh' > /start.sh \
+&& chmod +x /start.sh
+
+COPY ./entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/bin/bash", "/start.sh"]
diff --git a/PterodactylImages/Ridged-Java22/custom_egg.json b/PterodactylImages/Minecraft-Paper/egg-paper.json
similarity index 100%
rename from PterodactylImages/Ridged-Java22/custom_egg.json
rename to PterodactylImages/Minecraft-Paper/egg-paper.json
diff --git a/PterodactylImages/Minecraft-Paper/entrypoint.sh b/PterodactylImages/Minecraft-Paper/entrypoint.sh
new file mode 100644
index 0000000..f3550b0
--- /dev/null
+++ b/PterodactylImages/Minecraft-Paper/entrypoint.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+cd /home/container || exit 1
+
+# Configure colors
+CYAN='\033[0;36m'
+RESET_COLOR='\033[0m'
+
+# Print Current Java Version
+java -version
+
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Replace Startup Variables
+# shellcheck disable=SC2086
+MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo -e "${CYAN}STARTUP /home/container: ${MODIFIED_STARTUP} ${RESET_COLOR}"
+
+# Run the Server
+# shellcheck disable=SC2086
+eval ${MODIFIED_STARTUP}