diff --git a/minecraft/forge/OldDockerfile b/minecraft/forge/OldDockerfile
index fc19d7f..0624c10 100644
--- a/minecraft/forge/OldDockerfile
+++ b/minecraft/forge/OldDockerfile
@@ -6,10 +6,8 @@ WORKDIR /opt/server
 COPY forge-${VERSION}-installer.jar /opt
 RUN java -jar /opt/forge-${VERSION}-installer.jar --installServer .
 COPY eula.txt .
+COPY old_entry_point.sh /entrypoint.sh
 RUN rm forge*installer* && mv forge*.jar forge-server.jar
-# RUN adduser -S minecraft minecraft
-# RUN chown -R minecraft /opt/server && chown -R root /opt/server/libraries
-# USER minecraft
 EXPOSE  25565/tcp
-ENTRYPOINT [ "java", "-jar", "forge-server.jar", "--nogui"]
+ENTRYPOINT [ "/entrypoint.sh" ]
 LABEL type=GAME
diff --git a/minecraft/paper/Dockerfile b/minecraft/paper/Dockerfile
index ac65416..de46fd8 100644
--- a/minecraft/paper/Dockerfile
+++ b/minecraft/paper/Dockerfile
@@ -1,21 +1,21 @@
-FROM alpine:latest
-ARG VERSION
-RUN mkdir -p /opt/server
-WORKDIR /opt/server
-RUN apk add openjdk21 jq curl
-RUN if [[ -z $VERSION ]] ; then VERSION=$(curl https://api.papermc.io/v2/projects/paper | jq -r .versions[-1]); fi;\
-    curl -o server.jar $(\
-                        curl https://api.papermc.io/v2/projects/paper/versions/${VERSION}/builds |\
-                        jq -r --arg VERSION $VERSION '"https://api.papermc.io/v2/projects/paper/versions/" \
-                                + $VERSION \
-                                + "/builds/" \
-                                + (.builds[-1].build|tostring) \
-                                + "/downloads/" \
-                                + (.builds[-1].downloads.application.name)'\
-                        )
-COPY eula.txt eula.txt
-RUN adduser -D minecraft -h /opt/server
-RUN chmod 111 server.jar  && chown -R minecraft:minecraft /opt/server && chmod -R 770 /opt/server
-USER minecraft:minecraft
-ENTRYPOINT [ "java", "-jar",  "server.jar" ]
-LABEL type=GAME
+FROM alpine:latest
+ARG VERSION
+RUN mkdir -p /opt/server
+WORKDIR /opt/server
+RUN apk add openjdk21 jq curl
+RUN if [[ -z $VERSION ]] ; then VERSION=$(curl https://api.papermc.io/v2/projects/paper | jq -r .versions[-1]); fi;\
+    curl -o server.jar $(\
+                        curl https://api.papermc.io/v2/projects/paper/versions/${VERSION}/builds |\
+                        jq -r --arg VERSION $VERSION '"https://api.papermc.io/v2/projects/paper/versions/" \
+                                + $VERSION \
+                                + "/builds/" \
+                                + (.builds[-1].build|tostring) \
+                                + "/downloads/" \
+                                + (.builds[-1].downloads.application.name)'\
+                        )
+COPY eula.txt eula.txt
+RUN adduser -D minecraft -h /opt/server
+RUN chmod 111 server.jar  && chown -R minecraft:minecraft /opt/server && chmod -R 770 /opt/server
+USER minecraft:minecraft
+ENTRYPOINT [ "java", "-jar",  "server.jar" ]
+LABEL type=GAME