diff --git a/Synapse/docker-compose.yml b/Synapse/docker-compose.yml
deleted file mode 100644
index c380f82..0000000
--- a/Synapse/docker-compose.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-version: "3.3"
-#networks:
-#  synapsenet:
-#    driver: bridge
-#    ipam:
-#      config:
-#      - subnet: 172.25.0.0/24
-services:
-    synapse:
-        image: "matrixdotorg/synapse:latest"
-        restart: always
-        container_name: "synapse"
-#        network_mode: synapsenet
-        volumes:
-            - "/mnt/2TB/synapse/data:/data"
-        environment:
-            VIRTUAL_HOST: "matrix.pogmom.me"
-            VIRTUAL_PORT: 8008
-            SYNAPSE_SERVER_NAME: "matrix.pogmom.me"
-            SYNAPSE_REPORT_STATS: "yes"
-        ports:
-            - "8008:8008/tcp"
-            - "8448:8448/tcp"
-
-    riot-web:
-        ports:
-            - '86:80'
-        image: bubuntux/riot-web
-        restart: always
-
-    postgresql:
-        image: postgres:latest
-        restart: always
-        hostname: synapse-postgresql-1
-        #network_mode: synapsenet
-        environment:
-            POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-            POSTGRES_USER: synapse
-            POSTGRES_DB: synapse
-            POSTGRES_INITDB_ARGS: "--encoding='UTF8' --lc-collate='C' --lc-ctype='C'"
-        volumes:
-            - "/mnt/2TB/synapse/postgres:/var/lib/postgresql/"
-        ports:
-            - "5432:5432/tcp"
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..70ff20a
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,214 @@
+version: "3.8"
+
+volumes:
+  nextcloud_aio_mastercontainer:
+    name: nextcloud_aio_mastercontainer
+
+services:
+
+  portainer_agent:
+    image: portainer/agent:2.19.3
+    container_name: portainer_agent
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /var/lib/docker/volumes:/var/lib/docker/volumes
+    ports:
+      - "9001:9001"
+    restart: always
+
+  mastodon-redis:
+    image: redis
+    container_name: mastodon-redis
+    network_mode: mastodonnet
+    volumes:
+      - ${DATA_PATH}/mastodon/redis:/data'
+    restart: unless-stopped
+
+  mastodon-db:
+    image: postgres:15.2
+    container_name: mastodon-db
+    network_mode: mastodonnet
+    environment:
+      - POSTGRES_USER=${MASTODON_DB_USER}
+      - POSTGRES_PASSWORD=${MASTODON_DB_PASS}
+    volumes:
+      - ${DATA_PATH}/mastodon/postgres:/var/lib/postgresql/data
+    restart: unless-stopped
+
+  mastodon-elasticsearch:
+    image: elasticsearch:8.8.0
+    container_name: mastodon-elasticsearch
+    network_mode: mastodonnet
+    environment:
+      - discovery.type=single-node
+      - xpack.ml.enabled=false
+#    volumes:
+#      - ${DATA_PATH}/mastodon/elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml
+    restart: unless-stopped
+
+  mastodon:
+    image: lscr.io/linuxserver/mastodon:latest
+    container_name: mastodon
+    network_mode: mastodonnet
+    environment:
+      - PUID=${UID}
+      - PGID=${GID}
+      - TZ=${TZ}
+      - LOCAL_DOMAIN=${MASTODON_DOMAIN}
+      - REDIS_HOST=mastodon-redis
+      - REDIS_PORT=6379
+      - DB_HOST=mastodon-db
+      - DB_USER=${MASTODON_DB_USER}
+      - DB_NAME=mastodon
+      - DB_PASS=${MASTODON_DB_PASS}
+      - DB_PORT=5432
+      - ES_ENABLED=true
+      - SECRET_KEY_BASE=${MASTODON_SECRET_KEY_BASE}
+      - OTP_SECRET=${MASTODON_OTP_SECRET}
+      - VAPID_PRIVATE_KEY=${MASTODON_VAPID_PRIVATE_KEY}
+      - VAPID_PUBLIC_KEY=${MASTODON_VAPID_PUBLIC_KEY}
+      - SMTP_SERVER=${SMTP_SERVER}
+      - SMTP_PORT=${SMTP_PORT}
+      - SMTP_LOGIN=${SMTP_USER}
+      - SMTP_PASSWORD=${SMTP_PASS}
+      - SMTP_FROM_ADDRESS=${SMTP_FROM}
+      - LDAP_ENABLED=true
+      - LDAP_METHOD=simple
+      - LDAP_HOST=${LDAP_SERVER}
+      - LDAP_PORT=${LDAP_PORT}
+      - LDAP_BASE=${LDAP_BASE}
+      - LDAP_SEARCH_FILTER=${LDAP_FILTER}
+      - LDAP_BIND_DN=${LDAP_BIND_DN}
+      - LDAP_PASSWORD=${LDAP_BIND_PASS}
+      - LDAP_UID=uid
+      - LDAP_MAIL=mail
+      - LDAP_UID_CONVERSION_ENABLED=true
+      - S3_ENABLED=false
+      - WEB_DOMAIN=${MASTODON_WEB_DOMAIN}
+      - ES_HOST=mastodon-elasticsearch
+      - ES_PORT=9200
+      - SIDEKIQ_ONLY=false
+      - SIDEKIQ_QUEUE=
+      - SIDEKIQ_DEFAULT=false
+      - SIDEKIQ_THREADS=5
+      - DB_POOL=5
+    volumes:
+      - ${DATA_PATH}/mastodon/config:/config
+    ports:
+      - ${MASTODON_HTTP_PORT}:80
+      - ${MASTODON_HTTPS_PORT}:443
+    restart: unless-stopped
+
+  mc-nginx:
+    image: nginx
+    container_name: mc-nginx
+    volumes:
+      - ${DATA_PATH}/mc-nginx/src:/usr/share/nginx/html
+    ports:
+      - ${MC_NGINX_PORT}:80
+    restart: unless-stopped
+
+  mc-smp:
+    image: itzg/minecraft-server
+    container_name: mc-smp
+    ports:
+      - ${MC_SMP_JAVA_PORT}:25565/tcp
+      - ${MC_SMP_JAVA_PORT}:25565/udp
+      - ${MC_SMP_BEDROCK_PORT}:19132/tcp
+      - ${MC_SMP_BEDROCK_PORT}:19132/udp
+    environment:
+      - EULA=TRUE
+      - EXEC_DIRECTLY=TRUE
+      - MEMORY=4G
+      - VERSION=LATEST
+      - TYPE=PAPER
+      - SPIGET_RESOURCES=18494
+      - MODS_FILE=/extras/mods.txt
+      - DIFFICULTY=${MC_SMP_DIFFICULTY}
+      - MOTD=${MC_SMP_MOTD}
+      - OPS=${MC_SMP_OPS}
+      - ICON=/extras/server-icon.png
+      - MAX_PLAYERS=${MC_SMP_MAX_PLAYERS}
+      - ALLOW_NETHER=TRUE
+      - ANNOUNCE_PLAYER_ACHIEVEMENTS=TRUE
+      - GENERATE_STRUCTURES=TRUE
+      - MODE=survival
+      - SERVER_NAME=${MC_SMP_NAME}
+      - ENABLE_ROLLING_LOGS=TRUE
+      - TZ=${TZ}
+    tty: true
+    stdin_open: true
+    volumes:
+      - ${DATA_PATH}/mc-smp/data:/data
+      - ${DATA_PATH}/mc-smp/extras:/extras
+    restart: unless-stopped
+
+#  crafty:
+#    container_name: crafty
+#    image: registry.gitlab.com/crafty-controller/crafty-4:latest
+#    environment:
+#        - TZ=${TZ}
+#    ports:
+#        - ${CRAFTY_HTTP_PORT}:8000
+#        - ${CRAFTY_HTTPS_PORT}:8443
+#        - ${CRAFT_DYNMAP_PORT}:8123
+#        - ${CRAFTY_BEDROCK_PORT}:19132
+#        - ${CRAFTY_JAVA_PORT}:25565
+#    volumes:
+#        - ${DATA_PATH}/crafty/backups:/crafty/backups
+#        - ${DATA_PATH}/crafty/logs:/crafty/logs
+#        - ${DATA_PATH}/crafty/servers:/crafty/servers
+#        - ${DATA_PATH}/crafty/config:/crafty/app/config
+#        - ${DATA_PATH}/crafty/import:/crafty/import
+#    restart: unless-stopped
+
+  all-in-one:
+    image: nextcloud/all-in-one:latest
+    container_name: nextcloud-aio-mastercontainer
+    environment:
+      - APACHE_PORT=11000
+      - APACHE_IP_BINDING=0.0.0.0
+      - NEXTCLOUD_DATADIR=${DATA_PATH}/nextcloud-aio/nextcloud
+    volumes:
+      - nextcloud_aio_mastercontainer:/mnt/docker-aio-config:rw
+      - '/var/run/docker.sock:/var/run/docker.sock:ro'
+    ports:
+      - 8080:8080
+    restart: always
+
+  synapse:
+    image: matrixdotorg/synapse:latest
+    container_name: "synapse"
+    volumes:
+      - ${DATA_PATH}/synapse/data:/data
+    environment:
+      - VIRTUAL_HOST=${MATRIX_SERVER}
+      - VIRTUAL_PORT=8008
+      - SYNAPSE_SERVER_NAME=${MATRIX_SERVER}
+      - SYNAPSE_REPORT_STATS="yes"
+    ports:
+      - ${MATRIX_PORT}:8008/tcp
+#      - "8448:8448/tcp"
+    restart: unless-stopped
+
+  riot-web:
+    image: bubuntux/riot-web
+    container_name: riot_web
+    ports:
+      - ${RIOT_PORT}:80
+    restart: unless-stopped
+
+  synapse-postgresql:
+    image: postgres:latest
+    container_name: synapse-postgresql
+    hostname: synapse-postgresql
+    environment:
+      - POSTGRES_PASSWORD=${SYNAPSE_DB_PASS}
+      - POSTGRES_USER=${SYNAPSE_DB_USER}
+      - POSTGRES_DB=synapse
+      - POSTGRES_INITDB_ARGS=--encoding='UTF8' --lc-collate='C' --lc-ctype='C'
+    volumes:
+      - ${DATA_PATH}/synapse/postgres:/var/lib/postgresql/
+    ports:
+      - ${SYNAPSE_DB_PORT}:5432/tcp
+    restart: unless-stopped
diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml
deleted file mode 100644
index 1c38b46..0000000
--- a/mastodon/docker-compose.yml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-version: "2.1"
-services:
-  mastodon-redis:
-    image: redis
-    network_mode: mastodonnet
-    container_name: mastodon-redis
-    restart: always
-    volumes:
-      - '/mnt/2TB/mastodon/redis:/data'
-  mastodon-db:
-    image: postgres:15.2
-    container_name: mastodon-db
-    network_mode: mastodonnet
-    restart: always
-    environment:
-      POSTGRES_USER: mastodon
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-    volumes:
-      - '/mnt/2TB/mastodon/postgres:/var/lib/postgresql/data'
-#    ports:
-#      - 5432:5432
-  mastodon-elasticsearch:
-    image: elasticsearch:8.8.0
-    container_name: mastodon-elasticsearch
-    network_mode: mastodonnet
-#    ports:
-#      - '9200:9200'
-    environment:
-      - discovery.type=single-node
-      - xpack.ml.enabled=false
-    volumes:
-      - '/mnt/2TB/mastodon/elasticsearch/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml'
-  mastodon:
-    image: lscr.io/linuxserver/mastodon:latest
-    network_mode: mastodonnet
-    container_name: mastodon
-    environment:
-      - PUID=0
-      - PGID=0
-      - TZ=${TZ}
-      - LOCAL_DOMAIN=pogmom.me
-      - REDIS_HOST=mastodon-redis
-      - REDIS_PORT=6379
-      - DB_HOST=mastodon-db
-      - DB_USER=mastodon
-      - DB_NAME=mastodon
-      - DB_PASS=${POSTGRES_PASSWORD}
-      - DB_PORT=5432
-      - ES_ENABLED=true
-      - SECRET_KEY_BASE=${SECRET_KEY_BASE}
-      - OTP_SECRET=${OTP_SECRET}
-      - VAPID_PRIVATE_KEY=${VAPID_PRIVATE_KEY}
-      - VAPID_PUBLIC_KEY=${VAPID_PUBLIC_KEY}
-      - SMTP_SERVER=mail.smtp2go.com
-      - SMTP_PORT=2525
-      - SMTP_LOGIN=pogmom
-      - SMTP_PASSWORD=${SMTP_PASSWORD}
-      - SMTP_FROM_ADDRESS=support@pogmom.me
-      - LDAP_ENABLED=true
-      - LDAP_METHOD=simple
-      - LDAP_HOST=ldap.pogmom.me
-      - LDAP_PORT=3890
-      - LDAP_BASE=dc=pogmom,dc=me
-      - LDAP_SEARCH_FILTER=(&(memberOf=cn=mastodon,ou=groups,dc=pogmom,dc=me)(&(objectclass=person)(|(%{uid}=%{email})(%{mail}=%{email}))))
-      - LDAP_BIND_DN=uid=admin,ou=people,dc=pogmom,dc=me
-      - LDAP_PASSWORD=${LDAP_PASSWORD}
-      - LDAP_UID=uid
-      - LDAP_MAIL=mail
-      - LDAP_UID_CONVERSION_ENABLED=true
-      - S3_ENABLED=false
-      - WEB_DOMAIN=masto.pogmom.me #optional
-      - ES_HOST=mastodon-elasticsearch #optional
-      - ES_PORT=9200 #optional
-#      - ES_USER=elastic #optional
-#      - ES_PASS=elastic #optional
-#      - S3_BUCKET= #optional
-#      - AWS_ACCESS_KEY_ID= #optional
-#      - AWS_SECRET_ACCESS_KEY= #optional
-#      - S3_ALIAS_HOST= #optional
-      - SIDEKIQ_ONLY=false #optional
-      - SIDEKIQ_QUEUE= #optional
-      - SIDEKIQ_DEFAULT=false #optional
-      - SIDEKIQ_THREADS=5 #optional
-      - DB_POOL=5 #optional
-    volumes:
-      - /mnt/2TB/mastodon/config:/config
-    ports:
-      - 80:80
-      - 443:443
-    restart: unless-stopped
diff --git a/minecraft-modded/docker-compose.yml b/minecraft-modded/docker-compose.yml
deleted file mode 100644
index a610549..0000000
--- a/minecraft-modded/docker-compose.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-version: "3"
-services:
-  minecraft-server:
-    image: itzg/minecraft-server:java8-multiarch
-    container_name: mc-modded
-    ports:
-      - "25566:25565"
-    environment:
-      EULA: "TRUE"
-      EXEC_DIRECTLY: "TRUE"
-      MEMORY: "4G"
-#      VERSION: "LATEST"
-      
-      TYPE: "AUTO_CURSEFORGE"
-      CF_API_KEY: "$$2a$$10$$u9An.w/G4.L5PSQnBCA0bOi0o2nFzaJO8JDktH8Df04hJyv/FHTp."
-      CF_PAGE_URL: "https://www.curseforge.com/minecraft/modpacks/roguelike-adventures-and-dungeons"
-#      CF_EXCLUDE_MODS: ""
-#      CF_MODPACK_ZIP: "/downloads/modpacks/RAD2-Serverpack-1.2.zip"
-#      SPIGET_RESOURCES: "18494"
-#      MODS_FILE: "/extras/mods.txt"
-#      EXTRA_ARGS: "--world-dir ./worlds/"
-      DIFFICULTY: "hard"
-      MOTD: "§3Join the discord at §ddis.pogmom.me§f\\n§fModded Server§f || §4Qu§cee§6r L§eib§aer§2at§1io§9n N§5ow§d!"
-      OPS: "pogmommy"
-#      ICON: "/extras/server-icon.png"
-      MAX_PLAYERS: "25"
-#      ALLOW_NETHER: "TRUE"
-      ANNOUNCE_PLAYER_ACHIEVEMENTS: "TRUE"
-      GENERATE_STRUCTURES: "TRUE"
-      MODE: "survival"
-      SERVER_NAME: "Pogmommy"
-      ENABLE_ROLLING_LOGS: "TRUE"
-      TZ: ${TZ}
-    tty: true
-    stdin_open: true
-    restart: unless-stopped
-    volumes:
-      - "/mnt/2TB/minecraft/modded:/data"
-#      - "./plugins:/plugins"
-#      - "./worlds:/worlds"
-      - "./extras:/extras"
-      - "./downloads:/downloads"
diff --git a/minecraft-modded/extras/server-icon.png b/minecraft-modded/extras/server-icon.png
deleted file mode 100644
index ab04b9a..0000000
Binary files a/minecraft-modded/extras/server-icon.png and /dev/null differ
diff --git a/minecraft-nginx/docker-compose.yml b/minecraft-nginx/docker-compose.yml
deleted file mode 100644
index 8460818..0000000
--- a/minecraft-nginx/docker-compose.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: "3"
-
-services:
-    client:
-        image: nginx
-        restart: unless-stopped
-        ports:
-            - 8065:80
-        volumes:
-            - ./src:/usr/share/nginx/html
diff --git a/minecraft-nginx/src/._index.html b/minecraft-nginx/src/._index.html
deleted file mode 100644
index 64f442a..0000000
Binary files a/minecraft-nginx/src/._index.html and /dev/null differ
diff --git a/minecraft-nginx/src/index.html b/minecraft-nginx/src/index.html
deleted file mode 100644
index bf073bd..0000000
--- a/minecraft-nginx/src/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<meta http-equiv="X-UA-Compatible" content="IE=edge">

<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=0">

<title>Penelope Gwen | Minecraft Servers</title>

<link rel="shortcut icon" href="http://www.pogmom.me/images/favicon.ico">

<iframe src="http://localhost" id="mframe" style="position:fixed; top:0; left:0; bottom:0; right:0; width:100%; height:100%; border:none; margin:0; padding:0; overflow:hidden; z-index:999999;">

    Your browser doesn't support iframes

</iframe>

<script>

console.log(window.top.location.pathname)

var mpath = "https://pogmom.me/mc.html"

 document.getElementById("mframe").src = mpath;

</script>

\ No newline at end of file
diff --git a/minecraft-survival/.DS_Store b/minecraft-survival/.DS_Store
deleted file mode 100644
index c594bff..0000000
Binary files a/minecraft-survival/.DS_Store and /dev/null differ
diff --git a/minecraft-survival/docker-compose.yml b/minecraft-survival/docker-compose.yml
deleted file mode 100644
index 004fc09..0000000
--- a/minecraft-survival/docker-compose.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-version: "3"
-services:
-  minecraft-server:
-    image: itzg/minecraft-server
-    container_name: mc-smp
-    ports:
-      - 25565:25565/tcp
-      - 25565:25565/udp
-      - 19132:19132/tcp
-      - 19132:19132/udp
-    environment:
-      EULA: "TRUE"
-      EXEC_DIRECTLY: "TRUE"
-      MEMORY: "4G"
-      VERSION: "LATEST"
-      TYPE: "PAPER"
-#      FORCE_REDOWNLOAD: "TRUE"
-#      SPIGOT_DOWNLOAD_URL: "https://github.com/pogmommy/mcpage/releases/download/v.120/spigot-1.20.jar"
-      SPIGET_RESOURCES: "18494"
-      MODS_FILE: "/extras/mods.txt"
-      #WORLD: /worlds/SMP.2022
-#      EXTRA_ARGS: "--world-dir ./worlds/"
-      DIFFICULTY: "hard"
-      MOTD: "§3Join the discord at §ddis.pogmom.me§f\\n§fSurvival Server§f || §4Qu§cee§6r L§eib§aer§2at§1io§9n N§5ow§d!"
-      OPS: "pogmommy"
-      ICON: "/extras/server-icon.png"
-      MAX_PLAYERS: "50"
-      ALLOW_NETHER: "TRUE"
-      ANNOUNCE_PLAYER_ACHIEVEMENTS: "TRUE"
-      GENERATE_STRUCTURES: "TRUE"
-      MODE: "survival"
-      SERVER_NAME: "Pogmommy"
-      ENABLE_ROLLING_LOGS: "TRUE"
-      TZ: ${TZ}
-    tty: true
-    stdin_open: true
-    restart: always
-    volumes:
-      - "/mnt/2TB/minecraft/smp:/data"
-#      - "./plugins:/plugins"
-#      - "./worlds:/worlds"
-      - "./extras:/extras"
diff --git a/minecraft-survival/extras/mods.txt b/minecraft-survival/extras/mods.txt
deleted file mode 100644
index 37c6660..0000000
--- a/minecraft-survival/extras/mods.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-https://ci.opencollab.dev/job/GeyserMC/job/Floodgate/job/master/lastSuccessfulBuild/artifact/spigot/build/libs/floodgate-spigot.jar
-https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/lastSuccessfulBuild/artifact/bootstrap/spigot/build/libs/Geyser-Spigot.jar
-#https://gitlab.com/Programie/MatterBukkit/-/jobs/artifacts/1.7/raw/target/MatterBukkit.jar?job=release
diff --git a/minecraft-survival/extras/server-icon.png b/minecraft-survival/extras/server-icon.png
deleted file mode 100644
index f3a0d54..0000000
Binary files a/minecraft-survival/extras/server-icon.png and /dev/null differ
diff --git a/nextcloud-aio/docker-compose.yml b/nextcloud-aio/docker-compose.yml
deleted file mode 100644
index d80629f..0000000
--- a/nextcloud-aio/docker-compose.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: '3.3'
-volumes:
-    nextcloud_aio_mastercontainer:
-        name: nextcloud_aio_mastercontainer
-services:
-    all-in-one:
-        container_name: nextcloud-aio-mastercontainer
-        restart: always
-        ports:
-            - '8080:8080'
-        environment:
-            - APACHE_PORT=11000
-            - APACHE_IP_BINDING=0.0.0.0
-            - NEXTCLOUD_DATADIR=/mnt/2TB/ncdata
-        volumes:
-            - 'nextcloud_aio_mastercontainer:/mnt/docker-aio-config:rw'
-            - '/var/run/docker.sock:/var/run/docker.sock:ro'
-        image: 'nextcloud/all-in-one:latest'