diff --git a/games-compose.yml b/games-compose.yml
index 45fcf28..5406408 100644
--- a/games-compose.yml
+++ b/games-compose.yml
@@ -11,17 +11,17 @@ services:
       - "/minecraft_thespacebetween:/mnt"
     working_dir: "/mnt"
     command: ["java", "-Xms256m", "-Xmx1024m", "-jar", "/mnt/paper-1.21.7-29.jar", "--nogui"]
-  team2648mc:
-    image: eclipse-temurin:21
-    restart: always
-    ports:
-      - "25564:25565"
-      - "25574:25575"
-      - "8123:8123"
-    volumes:
-      - "/minecraft_team2648mc:/mnt"
-    working_dir: "/mnt"
-    command: ["java", "-Xms256m", "-Xmx4096m", "-jar", "/mnt/paper-1.21.7-29.jar", "--nogui"]
+#  team2648mc:
+#    image: eclipse-temurin:21
+#    restart: always
+#    ports:
+#      - "25564:25565"
+#      - "25574:25575"
+#      - "8123:8123"
+#    volumes:
+#      - "/minecraft_team2648mc:/mnt"
+#    working_dir: "/mnt"
+#    command: ["java", "-Xms256m", "-Xmx4096m", "-jar", "/mnt/paper-1.21.7-29.jar", "--nogui"]
   caleysmc:
     image: eclipse-temurin:25
     restart: always
diff --git a/nextcloud-compose.yml b/nextcloud-compose.yml
new file mode 100644
index 0000000..762f4b6
--- /dev/null
+++ b/nextcloud-compose.yml
@@ -0,0 +1,24 @@
+name: nextcloud-aio 
+services:
+  nextcloud-aio-mastercontainer:
+    image: ghcr.io/nextcloud-releases/all-in-one:latest 
+    init: true
+    restart: always 
+    container_name: nextcloud-aio-mastercontainer
+    volumes:
+      - nextcloud_aio_mastercontainer:/mnt/docker-aio-config 
+      - /var/run/docker.sock:/var/run/docker.sock:ro 
+    network_mode: bridge 
+    ports:
+      - "8080:8080" 
+    environment:
+      APACHE_PORT: 11000
+      APACHE_IP_BINDING: 10.26.48.4
+      NEXTCLOUD_DATADIR: /nextcloud_data 
+      NEXTCLOUD_UPLOAD_LIMIT: 16G
+      NEXTCLOUD_MAX_TIME: 3600 
+      NEXTCLOUD_MEMORY_LIMIT: 1024M
+
+volumes: 
+  nextcloud_aio_mastercontainer:
+    name: nextcloud_aio_mastercontainer
diff --git a/web-compose.yml b/web-compose.yml
index 1c6988b..5135006 100644
--- a/web-compose.yml
+++ b/web-compose.yml
@@ -53,53 +53,15 @@ services:
       - nginx_config:/etc/nginx/conf.d:ro
       - /tandoor/statics:/static:ro
       - /tandoor/media:/media:ro  
-  brad-vscode:
-    image: git.coldlightalchemist.com/bradley/code-server-wpilib-fedora:2026.2.1
-    container_name: brad_vscode
-    restart: always
-    ports:
-      - "8082:8080"
-  jasper-vscode:
-    image: git.coldlightalchemist.com/bradley/code-server-wpilib-fedora:2026.2.1
-    container_name: jasper_vscode
-    restart: always
-    ports:
-      - "8084:8080"
-  collin-vscode:
-    image: git.coldlightalchemist.com/bradley/code-server-wpilib-fedora:2026.2.1
-    container_name: collin_vscode
-    restart: always
-    ports:
-      - "8085:8080"
-  nextcloud:
-    image: nextcloud:apache
-    container_name: nextcloud
-    restart: always
-    ports:
-      - "8086:80"
+  ntfy:
+    image: binwiederhier/ntfy
+    command: serve
+    env_file: .ntfy.env
     volumes:
-      - "/nextcloud:/var/www/html"
-    env_file: .nextcloud.env
-    networks:
-      - nextcloud_network
-    depends_on: 
-      - redis
-  redis:
-    image: redis:alpine
-    container_name: nextcloud_redis
-    restart: always
-    command:
-      - /bin/sh
-      - -c
-      - redis-server --requirepass "$${REDIS_PASSWORD:?REDIS_PASSWORD variable is not set}"
-    volumes:
-      - redis_data:/data
-    networks:
-      - nextcloud_network
-    env_file: .redis_nextcloud.env
+      - /ntfy/cache:/var/cache/ntfy
+      - /ntfy/lib:/var/lib/ntfy
+    ports:
+      - "8082:80"
+    restart: unless-stopped
 volumes:
   nginx_config:
-  redis_data:
-networks:
-  nextcloud_network:
-    driver: bridge