diff --git a/siverten/velocity/Dockerfile b/siverten/velocity/Dockerfile
index 198b2ce..c755ed9 100644
--- a/siverten/velocity/Dockerfile
+++ b/siverten/velocity/Dockerfile
@@ -23,13 +23,12 @@ RUN if test -z "${VELOCITY_VERSION}" || test "${VELOCITY_VERSION}" == "latest";
     curl -lfso velocity.jar "${DOWNLOAD_URL}"
 
 FROM eclipse-temurin:${JAVA_VERSION}
-RUN useradd --create-home --shell /bin/bash minecraft \
- && mkdir -p /opt/velocity /velocity \
- && chown -R minecraft /velocity/
 COPY --from=waterfall /velocity.jar /opt/velocity/
-USER minecraft
 WORKDIR /velocity
 VOLUME /velocity
 EXPOSE 25565
 ENV JAVA_MEM=1G
-CMD java -Xms${JAVA_MEM} -Xmx${JAVA_MEM} -jar /opt/velocity/velocity.jar
+CMD java -Xms${JAVA_MEM} -Xmx${JAVA_MEM} \
+ -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions \
+ -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 \
+ -jar /opt/velocity/velocity.jar