diff --git a/.forgejo/workflows/build-push-jre-alpine.yml b/.forgejo/workflows/build-push-jre-alpine.yml
index d3822cc..0eff078 100644
--- a/.forgejo/workflows/build-push-jre-alpine.yml
+++ b/.forgejo/workflows/build-push-jre-alpine.yml
@@ -2,7 +2,7 @@ on:
   workflow_dispatch:
   push:
     tags:
-      - 'jre-alpine*.**.*/v**'
+      - 'jre-alpine*.**/v**'
   schedule:
     - cron: '0 0 1-31 1-12 1'
 
diff --git a/README.md b/README.md
index 2b34dd0..7fd7bee 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ## About MMS
 
-**M**odded **M**inecraft **S**erver project - the name says it all (I'm open for suggestions if you've got a better name). This repository is mostly about the modpack and includes other info like the configuration of the official server running at mms.nanody.de.  
-MMS revolves around the [Create mod](https://github.com/Fabricators-of-Create/Create). Why Create? Because it's a cool mod, obviously!  
+This is a **M**odded **M**inecraft **S**erver project, mostly a modpack. (please tell me a better name than MMS, I'm open for suggestions)  
+MMS is centralised around the [Create mod](https://github.com/Fabricators-of-Create/Create). Why Create? Because it's a cool mod, obviously!  
 Apart from that there are 4 goals:  
 - Only add features and functionality to the game, keep the vanilla features and functionality untouched. Complex Redstone contraptions, for example, which are supposed to work in vanilla, should also work with the MMS modpack.  
 - Find a middle ground between being too minimalistic and too bloated.  
diff --git a/server/MMS.container b/server/MMS.container
deleted file mode 100644
index 045b7da..0000000
--- a/server/MMS.container
+++ /dev/null
@@ -1,27 +0,0 @@
-[Unit]
-Description=Modded Minecraft Server via Podman managed by Systemd
-Documentation=https://git.nanody.de/anonoe/MMS
-Wants=velocity.service
-After=velocity.service
-
-[Container]
-Image=git.nanody.de/anonoe/jre-alpine:latest
-AutoUpdate=registry
-PublishPort=25566:25565/tcp
-PublishPort=24455:24455/udp
-UserNS=keep-id
-Mount=type=bind,src=/PATH/TO/server,dst=/mnt/server
-Mount=type=bind,src=/PATH/TO/rcon,dst=/mnt/rcon
-WorkingDir=/mnt/server
-PodmanArgs=--tty --interactive
-Exec=java -Xmx4G -Xms1G -jar minecraft_server.jar --nogui
-
-[Service]
-SuccessExitStatus=0 143
-TimeoutStartSec=480
-TimeoutStopSec=480
-ExecStop=-podman exec systemd-MMS sh /mnt/rcon/stop.sh
-
-[Install]
-# Start by default on boot
-WantedBy=default.target
diff --git a/server/compose.yml b/server/compose.yml
new file mode 100644
index 0000000..1c7584d
--- /dev/null
+++ b/server/compose.yml
@@ -0,0 +1,13 @@
+version: '3.8'
+services:
+  jre-hl-mc-MMS:
+    image: alp-jre-21-hl:latest
+    volumes:
+      - ./server:/mnt/server
+    working_dir: /mnt/server
+    command: ["java", "-Xmx4G", "-Xms1G", "-jar", "minecraft_server.jar", "--nogui"]
+    ports:
+      - "25565:25565/tcp" # minecraft
+      - "24454:24454/udp" # simple voicechat
+    tty: true
+    # restart: unless-stopped
diff --git a/server/podman-run.sh b/server/podman-run.sh
new file mode 100755
index 0000000..f9125ad
--- /dev/null
+++ b/server/podman-run.sh
@@ -0,0 +1,12 @@
+podman run \
+ --rm \
+ --name jre-hl-mc-MMS \
+ --tty \
+ --interactive \
+ --publish 25565:25565/tcp \
+ --publish 24454:24454/udp \
+ --volume ./server:/mnt/server \
+ --workdir /mnt/server \
+alp-jre-21-hl:latest \
+java -Xmx4G -Xms1G -jar minecraft_server.jar --nogui
+
diff --git a/server/rcon/rconrc b/server/rcon/rconrc
deleted file mode 100755
index e24446e..0000000
--- a/server/rcon/rconrc
+++ /dev/null
@@ -1,5 +0,0 @@
-[MMS]
-hostname = 0.0.0.0
-port = 25575
-password = PUT_PASSWORD_HERE_FROM_server.properties
-minecraft = true
diff --git a/server/rcon/stop.sh b/server/rcon/stop.sh
deleted file mode 100755
index 66b20bc..0000000
--- a/server/rcon/stop.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-alias rc='rcon -c /mnt/rcon/rconrc -s MMS '
-rc 'tellraw @a ["",{"text":"!WARNING!","bold":true,"color":"red"}," The server will ",{"text":"shut down or restart","hoverEvent":{"action":"show_text","contents":"The state is unknown (like quantum physics)"}}," in",{"text":" 10","color":"dark_red"}," seconds..."]'
-sleep 5
-rc 'tellraw @a ["Stopping in"]'
-rc 'tellraw @a {"text":"5","color":"red"}'
-sleep 1
-rc 'tellraw @a {"text":"4","color":"red"}'
-sleep 1
-rc 'tellraw @a {"text":"3","color":"red"}'
-sleep 1
-rc 'tellraw @a {"text":"2","color":"dark_red"}'
-sleep 1
-rc 'tellraw @a ["",{"text":"!","obfuscated":true,"color":"dark_red"},{"text":" 1 ","color":"dark_red"},{"text":"!","obfuscated":true,"color":"dark_red"}]'
-sleep 1
-rc stop
diff --git a/server/server/config/FabricProxy-Lite.toml b/server/server/config/FabricProxy-Lite.toml
deleted file mode 100644
index 22a0716..0000000
--- a/server/server/config/FabricProxy-Lite.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-hackOnlineMode = true
-hackEarlySend = false
-hackMessageChain = false
-secret = "PUT SOMETHING HERE"
diff --git a/server/server/config/voicechat/voicechat-server.properties b/server/server/config/voicechat/voicechat-server.properties
index cc9d231..b3372b2 100644
--- a/server/server/config/voicechat/voicechat-server.properties
+++ b/server/server/config/voicechat/voicechat-server.properties
@@ -6,7 +6,7 @@
 # Set this to '-1' to use the same port number that is used by the Minecraft server.
 # However, it is strongly recommended NOT to use the same port number because UDP on
 # it is also used by default for the server query. Doing so may crash the server!
-port=24455
+port=24454
 # The server IP address to bind the voice chat to
 # Leave blank to use the 'server-ip' property from the 'server.properties' config file
 # To bind to the wildcard IP address, use '*'
diff --git a/server/server/mods/FabricProxy-Lite-2.6.0.jar b/server/server/mods/FabricProxy-Lite-2.6.0.jar
deleted file mode 100644
index 6bd4285..0000000
Binary files a/server/server/mods/FabricProxy-Lite-2.6.0.jar and /dev/null differ
diff --git a/server/server/mods/crossstitch-0.1.6.jar b/server/server/mods/crossstitch-0.1.6.jar
deleted file mode 100644
index 5fc5b3c..0000000
Binary files a/server/server/mods/crossstitch-0.1.6.jar and /dev/null differ
diff --git a/server/server/server.properties b/server/server/server.properties
index defd953..07d7b09 100644
--- a/server/server/server.properties
+++ b/server/server/server.properties
@@ -46,9 +46,9 @@ server-port=25565
 enable-jmx-monitoring=false
 enable-query=false
 query.port=25565
-enable-rcon=true
+enable-rcon=false
 rcon.port=25575
-# PUT A PASSWORD HERE
+#password is redacted
 rcon.password=
 use-native-transport=true
 network-compression-threshold=256
diff --git a/server/velocity.container b/server/velocity.container
deleted file mode 100644
index dfd3b7d..0000000
--- a/server/velocity.container
+++ /dev/null
@@ -1,23 +0,0 @@
-[Unit]
-Description=Minecraft Proxy Velocity via Podman managed by Systemd
-Documentation=https://docs.papermc.io/velocity/
-
-[Container]
-Image=git.nanody.de/anonoe/jre-alpine:latest
-AutoUpdate=registry
-PublishPort=25565:25565/tcp
-PublishPort=24454:24454/udp
-UserNS=keep-id
-Mount=type=bind,src=PATH/TO/velocity,dst=/mnt/server
-WorkingDir=/mnt/server
-PodmanArgs=--tty --interactive
-Exec=java -Xms500M -Xmx500M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar velocity.jar
-
-[Service]
-SuccessExitStatus=0 143
-TimeoutStartSec=480
-TimeoutStopSec=480
-
-[Install]
-# Start by default on boot
-WantedBy=default.target
diff --git a/server/velocity/plugins/LuckPerms-Velocity-5.5.17.jar b/server/velocity/plugins/LuckPerms-Velocity-5.5.17.jar
deleted file mode 100644
index 33515fe..0000000
Binary files a/server/velocity/plugins/LuckPerms-Velocity-5.5.17.jar and /dev/null differ
diff --git a/server/velocity/plugins/voicechat-velocity-2.6.4.jar b/server/velocity/plugins/voicechat-velocity-2.6.4.jar
deleted file mode 100644
index e459723..0000000
Binary files a/server/velocity/plugins/voicechat-velocity-2.6.4.jar and /dev/null differ
diff --git a/server/velocity/plugins/voicechat/voicechat-proxy.properties b/server/velocity/plugins/voicechat/voicechat-proxy.properties
deleted file mode 100644
index 5b78ba4..0000000
--- a/server/velocity/plugins/voicechat/voicechat-proxy.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Simple Voice Chat proxy config v2.6.4
-
-# The port number to use for the voice chat communication.
-# Audio packets are always transmitted via the UDP protocol on the port number
-# specified here, independently of other networking used for the game server.
-# Set this to '-1' to use the same port number as the one used by the proxy.
-port=24454
diff --git a/server/velocity/velocity.jar b/server/velocity/velocity.jar
deleted file mode 120000
index 7c32d0d..0000000
--- a/server/velocity/velocity.jar
+++ /dev/null
@@ -1 +0,0 @@
-velocity-3.4.0-SNAPSHOT-558.jar
\ No newline at end of file
diff --git a/server/velocity/velocity.toml b/server/velocity/velocity.toml
deleted file mode 100644
index 0e69f09..0000000
--- a/server/velocity/velocity.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Config version. Do not change this
-config-version = "2.7"
-
-# What should be the MOTD? This gets displayed when the player adds your server to
-# their server list. Only MiniMessage format is accepted.
-motd = "<#09add3>The Server is down (╯°□°)╯︵ ┻━┻"
-
-# Should we forward IP addresses and other data to backend servers?
-# Available options:
-# - "none":        No forwarding will be done. All players will appear to be connecting
-#                  from the proxy and will have offline-mode UUIDs.
-# - "legacy":      Forward player IPs and UUIDs in a BungeeCord-compatible format. Use this
-#                  if you run servers using Minecraft 1.12 or lower.
-# - "bungeeguard": Forward player IPs and UUIDs in a format supported by the BungeeGuard
-#                  plugin. Use this if you run servers using Minecraft 1.12 or lower, and are
-#                  unable to implement network level firewalling (on a shared host).
-# - "modern":      Forward player IPs and UUIDs as part of the login process using
-#                  Velocity's native forwarding. Only applicable for Minecraft 1.13 or higher.
-player-info-forwarding-mode = "modern"
-
-[servers]
-# Configure your servers here. Each key represents the server's name, and the value
-# represents the IP address of the server to connect to.
-#lobby = "127.0.0.1:30066"
-#factions = "127.0.0.1:30067"
-#minigames = "127.0.0.1:30068"
-mms = "host.containers.internal:25566"
-# In what order we should try servers when a player logs in or is kicked from a server.
-try = [
-    "mms"
-]
-
-[forced-hosts]
-"nanody.de" = [
-    "mms"
-]
-"mms.nanody.de" = [
-    "mms"
-]