diff --git a/stacks/apps/adminer/stack.yml b/adminer-stack.yml
similarity index 100%
rename from stacks/apps/adminer/stack.yml
rename to adminer-stack.yml
diff --git a/stacks/media/emby/stack.yml b/emby-stack.yml
similarity index 100%
rename from stacks/media/emby/stack.yml
rename to emby-stack.yml
diff --git a/stacks/startup/gitea-runner/stack.yml b/git-runner-stack.yml
similarity index 100%
rename from stacks/startup/gitea-runner/stack.yml
rename to git-runner-stack.yml
diff --git a/stacks/apps/n8n/stack.yml b/n8n-stack.yml
similarity index 100%
rename from stacks/apps/n8n/stack.yml
rename to n8n-stack.yml
diff --git a/stacks/media/notifiarr/stack.yml b/notifiarr-stack.yml
similarity index 100%
rename from stacks/media/notifiarr/stack.yml
rename to notifiarr-stack.yml
diff --git a/stacks/apps/outline/stack.yml b/outline-stack.yml
similarity index 100%
rename from stacks/apps/outline/stack.yml
rename to outline-stack.yml
diff --git a/stacks/apps/paperless/stack.yml b/paperless-stack.yml
similarity index 100%
rename from stacks/apps/paperless/stack.yml
rename to paperless-stack.yml
diff --git a/stacks/apps/peertube/stack.yml b/peertube-stack.yml
similarity index 100%
rename from stacks/apps/peertube/stack.yml
rename to peertube-stack.yml
diff --git a/stacks/media/prowlarr/stack.yml b/prowlarr-stack.yml
similarity index 100%
rename from stacks/media/prowlarr/stack.yml
rename to prowlarr-stack.yml
diff --git a/stacks/media/radarr/stack.yml b/radarr-stack.yml
similarity index 100%
rename from stacks/media/radarr/stack.yml
rename to radarr-stack.yml
diff --git a/stacks/data/rsync/stack.yml b/rsync-stack.yml
similarity index 100%
rename from stacks/data/rsync/stack.yml
rename to rsync-stack.yml
diff --git a/stacks/media/sabNZB/stack.yml b/sab-stack.yml
similarity index 100%
rename from stacks/media/sabNZB/stack.yml
rename to sab-stack.yml
diff --git a/stacks/media/sonarr/stack.yml b/sonarr-stack.yml
similarity index 100%
rename from stacks/media/sonarr/stack.yml
rename to sonarr-stack.yml
diff --git a/stacks/apps/peertube/README.md b/stacks/apps/peertube/README.md
deleted file mode 100644
index c704616..0000000
--- a/stacks/apps/peertube/README.md
+++ /dev/null
@@ -1,171 +0,0 @@
-# PeerTube Docker Swarm Setup
-
-## Prerequisites
-
-1. Traefik is running and configured
-2. PostgreSQL is running (`postgresSQL` service)
-3. The `homelab` network exists
-4. DNS record for `videos.frostlabs.me` points to your server
-
-## Setup Steps
-
-### 1. Create PeerTube Database
-
-Connect to your existing PostgreSQL instance and create the PeerTube database:
-
-```bash
-# Connect to PostgreSQL container
-docker exec -it $(docker ps -q -f name=postgresSQL) psql -U admin -d postgres
-
-# Create database (user 'admin' already exists with postgres-master secret)
-CREATE DATABASE peertube;
-GRANT ALL PRIVILEGES ON DATABASE peertube TO admin;
-\q
-```
-
-### 2. Create Docker Secret for PeerTube
-
-You already have the `postgres-master` secret for database access. You just need to create the PeerTube application secret:
-
-```bash
-# Generate and create the PeerTube secret
-echo "$(openssl rand -hex 32)" | docker secret create peertube-secret -
-
-# Verify the secret was created
-docker secret ls | grep peertube
-```
-
-**Note:** The stack uses your existing `postgres-master` secret for database authentication with the `admin` user.
-
-### 3. Verify Data Directory Permissions
-
-```bash
-# Check that the PeerTube appdata directory exists and has correct permissions
-ls -la /home/doc/projects/unraid-appdata/PeerTube
-
-# If needed, fix permissions (UID 999 is the PeerTube user)
-sudo chown -R 999:999 /home/doc/projects/unraid-appdata/PeerTube
-```
-
-### 4. Deploy the Stack
-
-```bash
-docker stack deploy -c stack.yml peertube
-```
-
-### 5. Monitor Deployment
-
-```bash
-# Watch the services
-docker service ls | grep peertube
-
-# Check logs
-docker service logs -f peertube_peertube
-
-# Check if healthy
-docker ps | grep peertube
-```
-
-### 6. Access PeerTube
-
-Once deployed, access PeerTube at: https://videos.frostlabs.me
-
-The first time you access it, you'll need to:
-1. Complete the setup wizard
-2. Create an admin account
-3. Configure additional settings in the admin panel
-
-## Configuration Notes
-
-### Database Connection
-- Host: `postgresSQL` (existing Postgres service)
-- Port: 5432 (internal)
-- Database: `peertube`
-- User: `admin`
-- Password: From `postgres-master` secret
-
-### Redis Connection
-- Host: `peertube-redis` (internal service)
-- Port: 6379 (default)
-
-### SMTP/Email
-- Host: `peertube-postfix` (internal service)
-- Port: 25
-- From: noreply@videos.frostlabs.me
-
-### Ports
-- **9000**: PeerTube HTTP (internal, proxied by Traefik)
-- **1935**: RTMP for live streaming (published on host)
-
-### Traefik Integration
-The stack is configured to use Traefik for:
-- SSL/TLS certificates (Let's Encrypt)
-- HTTPS on port 443
-- HTTP to HTTPS redirect
-- Domain: videos.frostlabs.me
-
-## Storage Layout
-
-All data is stored in `/home/doc/projects/unraid-appdata/PeerTube`:
-- Videos and media files
-- Thumbnails and previews
-- User uploads
-- Logs
-- Configuration
-
-## Troubleshooting
-
-### Check service status
-```bash
-docker service ps peertube_peertube --no-trunc
-```
-
-### View logs
-```bash
-docker service logs peertube_peertube
-docker service logs peertube_peertube-redis
-docker service logs peertube_peertube-postfix
-```
-
-### Database connection issues
-```bash
-# Test connection from PeerTube container
-docker exec -it $(docker ps -q -f name=peertube_peertube) sh
-nc -zv postgresSQL 5432
-```
-
-### Restart services
-```bash
-docker service update --force peertube_peertube
-```
-
-### Remove and redeploy
-```bash
-docker stack rm peertube
-# Wait for cleanup
-docker stack deploy -c stack.yml peertube
-```
-
-## Updating PeerTube
-
-```bash
-# Update the image
-docker service update --image chocobozzz/peertube:production-bookworm peertube_peertube
-
-# Or redeploy the stack
-docker stack deploy -c stack.yml peertube
-```
-
-## Security Considerations
-
-1. Change the default admin password after first login
-2. Keep PEERTUBE_SECRET secure and never commit it to version control
-3. Regularly update the PeerTube image for security patches
-4. Configure proper email settings for notifications
-5. Review and configure user registration settings in admin panel
-
-## Additional Resources
-
-- [PeerTube Documentation](https://docs.joinpeertube.org/)
-- [PeerTube Production Guide](https://docs.joinpeertube.org/install/docker)
-- [PeerTube Admin Documentation](https://docs.joinpeertube.org/admin/following-instances)
diff --git a/stacks/startup/authentik/stack.yml b/stacks/startup/authentik/stack.yml
deleted file mode 100644
index b02eeec..0000000
--- a/stacks/startup/authentik/stack.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-services:
-  redis:
-    image: redis:alpine
-    command: --save 60 1 --loglevel warning
-    volumes:
-    - /home/doc/projects/swarm-data/appdata/authentik/redis:/data
-    networks:
-    - homelab
-    healthcheck:
-      test: [ "CMD", "redis-cli", "ping" ]
-      interval: 30s
-      timeout: 5s
-      retries: 3
-      start_period: 10s
-    deploy:
-      replicas: 1
-      resources:
-        limits:
-          memory: 512M
-        reservations:
-          memory: 128M
-
-  authentik_server:
-    image: ghcr.io/goauthentik/server:2025.10.0
-    command: server
-    environment:
-      AUTHENTIK_SECRET_KEY: "file:///run/secrets/auth-key"
-      AUTHENTIK_REDIS__HOST: "redis"
-      AUTHENTIK_POSTGRESQL__HOST: "10.0.4.10"
-      AUTHENTIK_POSTGRESQL__PORT: "5432"
-      AUTHENTIK_POSTGRESQL__USER: "admin"
-      AUTHENTIK_POSTGRESQL__NAME: "authentik"
-      AUTHENTIK_POSTGRESQL__PASSWORD: "file:///run/secrets/postgres-master"
-      # Optional: Set error reporting (set to false for privacy)
-      AUTHENTIK_ERROR_REPORTING__ENABLED: "false"
-    secrets:
-    - auth-key
-    - postgres-master
-    volumes:
-    - /home/doc/projects/swarm-data/appdata/authentik/media:/media
-    - /home/doc/projects/swarm-data/appdata/authentik/templates:/templates
-    - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-    - homelab
-    healthcheck:
-      test: [ "CMD-SHELL", "ak healthcheck" ]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 90s
-    deploy:
-      replicas: 1
-      resources:
-        limits:
-          memory: 1G
-          cpus: '1.0'
-        reservations:
-          memory: 512M
-      labels:
-      - "traefik.enable=true"
-      - "traefik.swarm.network=homelab"
-      # Public-facing domain with Let's Encrypt certificate
-      - "traefik.http.routers.authentik.rule=Host(`auth.frostlabs.me`)"
-      - "traefik.http.routers.authentik.entrypoints=websecure"
-      - "traefik.http.routers.authentik.tls=true"
-      - "traefik.http.routers.authentik.tls.certresolver=cloudflare"
-      - "traefik.http.services.authentik.loadbalancer.server.port=9000"
-
-    depends_on:
-    - redis
-
-  authentik_worker:
-    image: ghcr.io/goauthentik/server:2025.10.0
-    command: worker
-    environment:
-      AUTHENTIK_SECRET_KEY: "file:///run/secrets/auth-key"
-      AUTHENTIK_REDIS__HOST: "redis"
-      AUTHENTIK_POSTGRESQL__HOST: "10.0.4.10"
-      AUTHENTIK_POSTGRESQL__PORT: "5432"
-      AUTHENTIK_POSTGRESQL__USER: "admin"
-      AUTHENTIK_POSTGRESQL__NAME: "authentik"
-      AUTHENTIK_POSTGRESQL__PASSWORD: "file:///run/secrets/postgres-master"
-      # Optional: Set error reporting (set to false for privacy)
-      AUTHENTIK_ERROR_REPORTING__ENABLED: "false"
-    secrets:
-    - auth-key
-    - postgres-master
-    volumes:
-    - /home/doc/projects/swarm-data/appdata/authentik/media:/media
-    - /home/doc/projects/swarm-data/appdata/authentik/templates:/templates
-    - /var/run/docker.sock:/var/run/docker.sock
-    networks:
-    - homelab
-    deploy:
-      replicas: 1
-      resources:
-        limits:
-          memory: 1G
-          cpus: '1.0'
-        reservations:
-          memory: 512M
-    depends_on:
-    - redis
-
-networks:
-  homelab:
-    external: true
-secrets:
-  postgres-master:
-    external: true
-  auth-key:
-    external: true
diff --git a/stacks/web/tracker/stack.yml b/tracker-stack.yml
similarity index 100%
rename from stacks/web/tracker/stack.yml
rename to tracker-stack.yml
diff --git a/stacks/startup/traefik/stack.yml b/traefik-stack.yml
similarity index 100%
rename from stacks/startup/traefik/stack.yml
rename to traefik-stack.yml