diff --git a/redxen.eu/config.mk b/redxen.eu/config.mk
index 181b92c..ab7ccd2 100644
--- a/redxen.eu/config.mk
+++ b/redxen.eu/config.mk
@@ -94,4 +94,6 @@ redxen.eu/services/minecraft/minecraft-rx/${BUILD_ID_OUT}: %/${BUILD_ID_OUT} : \
 	%/config/ops.json \
 	%/config/server.properties \
 	%/config/server-icon.png \
+	%/config/bukkit.yml \
+	%/config/spigot.yml \
 	redxen.eu/services/minecraft/spigot/${BUILD_ID_OUT}
diff --git a/redxen.eu/services/minecraft/minecraft-rx/Containerfile b/redxen.eu/services/minecraft/minecraft-rx/Containerfile
index a871219..1c55645 100644
--- a/redxen.eu/services/minecraft/minecraft-rx/Containerfile
+++ b/redxen.eu/services/minecraft/minecraft-rx/Containerfile
@@ -4,7 +4,9 @@ FROM redxen.eu/services/minecraft/spigot:latest
 ADD config/server.properties /minecraft/server.properties
 ADD config/server-icon.png /minecraft/server-icon.png
 ADD config/ops.json /minecraft/ops.json
-ADD start.sh /minecraft/start.sh
+ADD config/bukkit.yml /minecraft/bukkit.yml
+ADD config/spigot.yml /minecraft/spigot.yml
+ADD start.sh /start.sh
 
 #COPY --from=redxen.eu/services/minecraft/worldguard:latest /artifacts/worldguard-bukkit.jar plugins/
 #COPY --from=redxen.eu/services/minecraft/worldedit:latest /artifacts/worldedit-bukkit.jar plugins/
@@ -18,4 +20,4 @@ ADD start.sh /minecraft/start.sh
 #	/minecraft/plugins/GroupManager/users.yml \
 #	/data/plugins/GroupManager/.
 
-ENTRYPOINT ["/minecraft/start.sh"]
+ENTRYPOINT ["/start.sh"]
diff --git a/redxen.eu/services/minecraft/minecraft-rx/config/bukkit.yml b/redxen.eu/services/minecraft/minecraft-rx/config/bukkit.yml
new file mode 100644
index 0000000..31473f5
--- /dev/null
+++ b/redxen.eu/services/minecraft/minecraft-rx/config/bukkit.yml
@@ -0,0 +1,2 @@
+ticks-per:
+  autosave: 72000
diff --git a/redxen.eu/services/minecraft/minecraft-rx/config/server.properties b/redxen.eu/services/minecraft/minecraft-rx/config/server.properties
index 889473a..05685d5 100644
--- a/redxen.eu/services/minecraft/minecraft-rx/config/server.properties
+++ b/redxen.eu/services/minecraft/minecraft-rx/config/server.properties
@@ -1,5 +1,6 @@
-online-mode: true
-difficulty: 3
-player-idle-timeout: 300
-max-players: 64
-motd: \u00A74\u00A7lRedXen \u00A72Minecraft Server\u00A7r\nNow back online with the old save!
+online-mode=true
+difficulty=3
+player-idle-timeout=300
+max-players=64
+sync-chunk-writes=false
+motd=\u00A74\u00A7lRedXen \u00A72Minecraft Server\u00A7r\nNow hosting on own infra!
diff --git a/redxen.eu/services/minecraft/minecraft-rx/config/spigot.yml b/redxen.eu/services/minecraft/minecraft-rx/config/spigot.yml
new file mode 100644
index 0000000..3a1be26
--- /dev/null
+++ b/redxen.eu/services/minecraft/minecraft-rx/config/spigot.yml
@@ -0,0 +1,3 @@
+settings:
+  timeout-time: 120
+  restart-on-crash: true
diff --git a/redxen.eu/services/minecraft/minecraft-rx/start.sh b/redxen.eu/services/minecraft/minecraft-rx/start.sh
index db29a08..efc20cc 100755
--- a/redxen.eu/services/minecraft/minecraft-rx/start.sh
+++ b/redxen.eu/services/minecraft/minecraft-rx/start.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-cp -v /minecraft/ops.json /minecraft/server-icon.png /minecraft/server.properties /data
+cp -v /minecraft/ops.json /minecraft/server-icon.png /minecraft/server.properties /minecraft/bukkit.yml /minecraft/spigot.yml /data
 
-java \
-	-Xmx4096M \
+exec java \
+	-Xmx8192M \
 	-Dfile.encoding=UTF-8 \
 	-Dcom.mojang.eula.agree=true \
 	-jar /minecraft/server.jar \