diff --git a/game-servers-new/docker-compose.override.yml b/game-servers-new/docker-compose.override.yml
deleted file mode 100644
index d195ae7..0000000
--- a/game-servers-new/docker-compose.override.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-services:
-  mariadb:
-    labels:
-      net.unraid.docker.managed: 'composeman'
-      net.unraid.docker.icon: ''
-      net.unraid.docker.webui: ''
-      net.unraid.docker.shell: ''
-  redis:
-    labels:
-      net.unraid.docker.managed: 'composeman'
-      net.unraid.docker.icon: ''
-      net.unraid.docker.webui: ''
-      net.unraid.docker.shell: ''
-  pterodactyl-panel:
-    labels:
-      net.unraid.docker.managed: 'composeman'
-      net.unraid.docker.icon: ''
-      net.unraid.docker.webui: ''
-      net.unraid.docker.shell: ''
-  pterodactyl-wings:
-    labels:
-      net.unraid.docker.managed: 'composeman'
-      net.unraid.docker.icon: ''
-      net.unraid.docker.webui: ''
-      net.unraid.docker.shell: ''
diff --git a/game-servers-new/docker-compose.yml b/game-servers-new/docker-compose.yml
deleted file mode 100644
index c52c34f..0000000
--- a/game-servers-new/docker-compose.yml
+++ /dev/null
@@ -1,92 +0,0 @@
-services:
-  mariadb:
-    image: mariadb:12.0.2
-    environment:
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - MYSQL_DATABASE=pterodactyl
-      - MYSQL_USER=pterodactyl
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-    volumes:
-      - /mnt/user/appdata/pterodactyl-panel-new/database:/var/lib/mysql
-    healthcheck:
-      test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
-      start_period: 10s
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    labels:
-      folder.view2: "Databases"
-
-  redis:
-    image: redis:6.2-alpine
-    volumes:
-      - /mnt/user/appdata/pterodactyl-panel-new/cache:/data
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 10s
-    labels:
-      folder.view2: "Databases"
-
-  pterodactyl-panel:
-    image: ghcr.io/pterodactyl/panel:latest
-    environment:
-      # Application settings
-      - APP_URL=${APP_URL}
-      - APP_NAME=${APP_NAME}
-      - APP_TIMEZONE=${APP_TIMEZONE}
-      - APP_SERVICE_AUTHOR=${APP_SERVICE_AUTHOR}
-
-      # Database settings
-      - DB_HOST=mariadb
-      - DB_PORT=3306
-      - DB_DATABASE=pterodactyl
-      - DB_USERNAME=pterodactyl
-      - DB_PASSWORD=${MYSQL_PASSWORD}
-
-      # Cache settings
-      - CACHE_DRIVER=redis
-      - SESSION_DRIVER=redis
-      - QUEUE_DRIVER=redis
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
-
-      # Mail settings (optional)
-      - MAIL_DRIVER=${MAIL_DRIVER}
-      - MAIL_HOST=${MAIL_HOST}
-      - MAIL_PORT=${MAIL_PORT}
-      - MAIL_USERNAME=${MAIL_USERNAME}
-      - MAIL_PASSWORD=${MAIL_PASSWORD}
-      - MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
-      - MAIL_FROM=${MAIL_FROM}
-    volumes:
-      - /mnt/user/appdata/pterodactyl-panel-new/data:/app/var/
-    ports:
-      - "6001:80"
-    depends_on:
-      mariadb:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-    labels:
-      folder.view2: "Game Servers"
-
-  pterodactyl-wings:
-    image: ghcr.io/pterodactyl/wings:latest
-    privileged: true
-    environment:
-      - TZ=${APP_TIMEZONE}
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /var/lib/docker/containers/:/var/lib/docker/containers/
-      - /mnt/user/pterodactyl-node-new/data/:/mnt/user/pterodactyl-node-new/data/
-      - /mnt/user/pterodactyl-node-new/tmp/:/mnt/user/pterodactyl-node-new/tmp/
-      - /mnt/user/pterodactyl-node-new/config/:/etc/pterodactyl/
-    ports:
-      - "7001:8080"   # Wings API
-      - "2022:2022"   # SFTP
-    working_dir: /var/lib/pterodactyl
-    labels:
-      folder.view2: "Game Servers"
diff --git a/game-servers-new/name b/game-servers-new/name
deleted file mode 100644
index 8e025e8..0000000
--- a/game-servers-new/name
+++ /dev/null
@@ -1 +0,0 @@
-game-servers-new
\ No newline at end of file
diff --git a/game-servers/docker-compose.override.yml b/game-servers/docker-compose.override.yml
index dc315e4..b575b40 100644
--- a/game-servers/docker-compose.override.yml
+++ b/game-servers/docker-compose.override.yml
@@ -5,12 +5,6 @@ services:
       net.unraid.docker.icon: ''
       net.unraid.docker.webui: ''
       net.unraid.docker.shell: ''
-  wings:
-    labels:
-      net.unraid.docker.managed: 'composeman'
-      net.unraid.docker.icon: ''
-      net.unraid.docker.webui: ''
-      net.unraid.docker.shell: ''
   mariadb:
     labels:
       net.unraid.docker.managed: 'composeman'
@@ -23,7 +17,7 @@ services:
       net.unraid.docker.icon: ''
       net.unraid.docker.webui: ''
       net.unraid.docker.shell: ''
-  pterodactyl-worker:
+  pterodactyl-wings:
     labels:
       net.unraid.docker.managed: 'composeman'
       net.unraid.docker.icon: ''
diff --git a/game-servers/docker-compose.yml b/game-servers/docker-compose.yml
index 4078260..83ce739 100644
--- a/game-servers/docker-compose.yml
+++ b/game-servers/docker-compose.yml
@@ -1,126 +1,13 @@
 services:
-  pterodactyl-panel:
-    image: ccarney16/pterodactyl-panel:latest
-    container_name: pterodactyl-panel
-    hostname: pterodactyl-panel
-    ports:
-      - "8001:80"
-    volumes:
-      - "/mnt/user/appdata/pterodactyl-panel/appdata/:/data" #Appdata of Container
-      - "/mnt/user/pterodactyl-node:/etc/pterodactyl" #Appdata - #Where config.yml goes into.
-      - "/mnt/user/pterodactyl-node/data:/mnt/user/pterodactyl-node/data" #Shared data between Panel and Node/Wings.
-      - "/mnt/user/appdata/pterodactyl-panel/nginx/:/etc/nginx/conf.d/" #Nginx Config
-    depends_on:
-      mariadb:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-    environment:
-      APP_ENV: "production"
-      APP_ENVIRONMENT_ONLY: false
-      APP_DEBUG: true # TODO Do I need this?
-      APP_SERVICE_AUTHOR: "tonitrus888@gmail.com"
-      APP_URL: "https://panel.homecube.org"
-      APP_TIMEZONE: "Europe/Vienna"
-
-      TRUSTED_PROXIES: "10.0.0.1" # TODO Do I need this?
-      
-      DB_HOST: "mariadb"
-      DB_PORT: 3306
-      DB_DATABASE: "pterodactyl"
-      DB_USERNAME: "pterodactyl-admin"
-      DB_PASSWORD: "Raving-Swell-Lend3-Pliable-Semicolon-Providing"
-
-      CACHE_DRIVER: "redis" #DON'T TOUCH
-      SESSION_DRIVER: "redis" #DON'T TOUCH
-      QUEUE_DRIVER: "redis" #DON'T TOUCH
-      REDIS_HOST: "redisdb"
-      REDIS_PORT: 6379
-      REDIS_USERNAME: "pterodactyl"
-      REDIS_PASSWORD: "Unmoral-Spoof-Conjure-Gender-Precut8-Attempt"
-
-      MAIL_FROM: "tonitrus888@gmail.com"
-      MAIL_DRIVER: "smtp"
-      MAIL_HOST: "smtp.gmail.com"
-      MAIL_PORT: "587"
-      MAIL_USERNAME: "tonitrus888@gmail.com"
-      MAIL_PASSWORD: "orlg mofu ehap ehhp"
-      MAIL_ENCRYPTION: true
-    labels:
-      folder.view2: "Game Servers"
-      
-  pterodactyl-worker:
-    image: ccarney16/pterodactyl-panel:latest
-    container_name: pterodactyl-worker
-    command: php /var/www/html/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
-    environment: # same env as the panel
-      APP_ENV: "production"
-      APP_ENVIRONMENT_ONLY: false
-      APP_SERVICE_AUTHOR: "tonitrus888@gmail.com"
-      APP_URL: "https://panel.homecube.org"
-      APP_TIMEZONE: "Europe/Vienna"
-      CACHE_DRIVER: "redis" #DON'T TOUCH
-      SESSION_DRIVER: "redis" #DON'T TOUCH
-      QUEUE_DRIVER: "redis" #DON'T TOUCH
-      REDIS_HOST: "redisdb"
-      REDIS_PORT: 6379
-      REDIS_USERNAME: "pterodactyl"
-      REDIS_PASSWORD: "Unmoral-Spoof-Conjure-Gender-Precut8-Attempt"
-      MAIL_FROM: "tonitrus888@gmail.com"
-      MAIL_DRIVER: "smtp"
-      MAIL_HOST: "smtp.gmail.com"
-      MAIL_PORT: "587"
-      MAIL_USERNAME: "tonitrus888@gmail.com"
-      MAIL_PASSWORD: "orlg mofu ehap ehhp"
-      MAIL_ENCRYPTION: true
-      APP_DEBUG: true
-      TRUSTED_PROXIES: "10.0.0.1"
-      DB_HOST: "mariadb"
-      DB_PORT: 3306
-      DB_USERNAME: "pterodactyl-admin"
-      DB_PASSWORD: "Raving-Swell-Lend3-Pliable-Semicolon-Providing"
-      DB_DATABASE: "pterodactyl"
-    volumes:
-      - "/mnt/user/appdata/pterodactyl-panel/appdata/:/data" #Appdata of Container
-      - "/mnt/user/pterodactyl-node:/etc/pterodactyl" #Appdata - #Where config.yml goes into.
-      - "/mnt/user/pterodactyl-node/data:/mnt/user/pterodactyl-node/data" #Shared data between Panel and Node/Wings.
-    depends_on:
-      mariadb:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-    restart: unless-stopped
-    labels:
-      folder.view2: "Game Servers"
-
-  wings:
-    image: ccarney16/pterodactyl-daemon:latest
-    container_name: pterodactyl-wings
-    hostname: pterodactyl-wings
-    ports:
-      - "2022:2022"
-      - "8002:8080"
-    tty: true
-    environment:
-      TZ: "Europe/Vienna"
-      WINGS_UID: 1000
-      WINGS_GID: 1000
-      WINGS_USERNAME: USER
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock" #docker.sock
-      - "/mnt/user/pterodactyl-node/data:/mnt/user/pterodactyl-node/data" #Shared data between Panel and Node/Wings.
-      - "/mnt/user/pterodactyl-node:/etc/pterodactyl" #Appdata - #Where config.yml goes into.
-      - "/mnt/user/pterodactyl-node/tmp:/mnt/user/pterodactyl-node/tmp" #tmp
-    labels:
-      folder.view2: "Game Servers"
-      
   mariadb:
     image: mariadb:12.0.2
-    container_name: mariadb
     environment:
-      MARIADB_ROOT_PASSWORD: asdkljflkj§/&$%("§/%(njdfklajseslif)")
+      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MYSQL_DATABASE=pterodactyl
+      - MYSQL_USER=pterodactyl
+      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
     volumes:
-      - /mnt/user/database/mariadb:/var/lib/mysql
+      - /mnt/user/appdata/pterodactyl-panel/database:/var/lib/mysql
     healthcheck:
       test: ["CMD", "healthcheck.sh", "--connect", "--innodb_initialized"]
       start_period: 10s
@@ -132,15 +19,8 @@ services:
 
   redis:
     image: redis:6.2-alpine
-    container_name: redisdb
-    command: >
-      redis-server
-      --aclfile /usr/local/etc/redis/users.acl
-      --save 20 1 
-      --loglevel warning
     volumes:
-      - /mnt/user/database/redis/users.acl:/usr/local/etc/redis/users.acl
-      - /mnt/user/database/redis:/data
+      - /mnt/user/appdata/pterodactyl-panel/cache:/data
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 10s
@@ -149,3 +29,64 @@ services:
       start_period: 10s
     labels:
       folder.view2: "Databases"
+
+  pterodactyl-panel:
+    image: ghcr.io/pterodactyl/panel:latest
+    environment:
+      # Application settings
+      - APP_URL=${APP_URL}
+      - APP_NAME=${APP_NAME}
+      - APP_TIMEZONE=${APP_TIMEZONE}
+      - APP_SERVICE_AUTHOR=${APP_SERVICE_AUTHOR}
+
+      # Database settings
+      - DB_HOST=mariadb
+      - DB_PORT=3306
+      - DB_DATABASE=pterodactyl
+      - DB_USERNAME=pterodactyl
+      - DB_PASSWORD=${MYSQL_PASSWORD}
+
+      # Cache settings
+      - CACHE_DRIVER=redis
+      - SESSION_DRIVER=redis
+      - QUEUE_DRIVER=redis
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+
+      # Mail settings (optional)
+      - MAIL_DRIVER=${MAIL_DRIVER}
+      - MAIL_HOST=${MAIL_HOST}
+      - MAIL_PORT=${MAIL_PORT}
+      - MAIL_USERNAME=${MAIL_USERNAME}
+      - MAIL_PASSWORD=${MAIL_PASSWORD}
+      - MAIL_ENCRYPTION=${MAIL_ENCRYPTION}
+      - MAIL_FROM=${MAIL_FROM}
+    volumes:
+      - /mnt/user/appdata/pterodactyl-panel/data:/app/var/
+    ports:
+      - "6001:80"
+    depends_on:
+      mariadb:
+        condition: service_healthy
+      redis:
+        condition: service_healthy
+    labels:
+      folder.view2: "Game Servers"
+
+  pterodactyl-wings:
+    image: ghcr.io/pterodactyl/wings:latest
+    privileged: true
+    environment:
+      - TZ=${APP_TIMEZONE}
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /var/lib/docker/containers/:/var/lib/docker/containers/
+      - /mnt/user/pterodactyl-node/data/:/mnt/user/pterodactyl-node/data/
+      - /mnt/user/pterodactyl-node/tmp/:/mnt/user/pterodactyl-node/tmp/
+      - /mnt/user/pterodactyl-node/config/:/etc/pterodactyl/
+    ports:
+      - "7001:8080"   # Wings API
+      - "2022:2022"   # SFTP
+    working_dir: /var/lib/pterodactyl
+    labels:
+      folder.view2: "Game Servers"