diff --git a/apprise-api/compose.yml b/apprise-api/compose.yml
new file mode 100644
index 0000000..c3b67dc
--- /dev/null
+++ b/apprise-api/compose.yml
@@ -0,0 +1,26 @@
+services:
+  apprise-api:
+    image: lscr.io/linuxserver/apprise-api:latest
+    container_name: apprise-api
+    environment:
+      - PUID=1000
+      - PGID=1000
+      - TZ=Etc/UTC
+      - APPRISE_ATTACH_SIZE=0 #optional
+    volumes:
+      - /home/fejy/docker/apprise-api/config:/config
+      - /home/fejy/docker/apprise-api/attachments:/attachments #optional
+    ports:
+      - 8006:8000
+    restart: unless-stopped
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.apprise.rule=Host(`apprise.nearfuture`)"
+      - "traefik.http.routers.apprise.entrypoints=web"
+
+networks:
+  proxy:
+    external: true
+
diff --git a/cross-seed/compose.yml b/cross-seed/compose.yml
new file mode 100644
index 0000000..b4d8b23
--- /dev/null
+++ b/cross-seed/compose.yml
@@ -0,0 +1,41 @@
+services:
+  cross-seed:
+    image: ghcr.io/cross-seed/cross-seed:6
+    container_name: cross-seed
+    user: 1029:1000 # this must match your torrent client (cross-seed does not support using PGID and PUID)
+    ports:
+      - "2468:2468"
+    volumes:
+      - /home/fejy/docker/cross-seed:/config
+      - /mnt/LUXURIA/Share:/Share
+    command: daemon
+    restart: unless-stopped
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.cross-seed.rule=Host(`cross-seed.nearfuture`)"
+      - "traefik.http.routers.cross-seed.entrypoints=web"
+  cross-seed2:
+    image: ghcr.io/cross-seed/cross-seed:6
+    container_name: cross-seed2
+    user: 1029:1000 # this must match your torrent client (cross-seed does not support using PGID and PUID)
+    ports:
+      - "2469:2468"
+    volumes:
+      - /home/fejy/docker/cross-seed2:/config
+      - /mnt/LUXURIA/Share:/Share
+    command: daemon
+    restart: unless-stopped
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.cross-seed2.rule=Host(`cross-seed2.nearfuture`)"
+      - "traefik.http.routers.cross-seed2.entrypoints=web"
+
+
+networks:
+  proxy:
+    external: true
+
diff --git a/excalidraw/compose.yml b/excalidraw/compose.yml
new file mode 100644
index 0000000..f1e9ded
--- /dev/null
+++ b/excalidraw/compose.yml
@@ -0,0 +1,21 @@
+services:
+  excalidraw:
+    container_name: excalidraw
+    image: excalidraw/excalidraw:latest
+    environment:
+      - PUID=1029
+      - PGID=1000
+    ports:
+      - "3030:80"
+    restart: on-failure
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.excalidraw.rule=Host(`excalidraw.nearfuture`)"
+      - "traefik.http.routers.excalidraw.entrypoints=web"
+
+networks:
+  proxy:
+    external: true
+
diff --git a/homepage/compose.yml b/homepage/compose.yml
index 0294847..4c0e8f6 100644
--- a/homepage/compose.yml
+++ b/homepage/compose.yml
@@ -2,13 +2,15 @@ services:
   homepage:
     image: ghcr.io/gethomepage/homepage:latest
     container_name: homepage
+    env_file: ".env"
     environment:
       PUID: 1029 # optional, your user id
-      PGID: 1000 # optional, your group id
+      PGID: 994 # optional, your group id
     ports:
       - 3069:3000
     volumes:
-      - /home/fejy/docker/homepage:/app/config # Make sure your local config directory exists
+      - /home/fejy/docker/homepage/config:/app/config
+      - /home/fejy/docker/homepage/icons:/app/public/icons
       - /var/run/docker.sock:/var/run/docker.sock:ro # optional, for docker integrations
     restart: unless-stopped
     networks:
diff --git a/portainer/compose.yml b/portainer/compose.yml
deleted file mode 100644
index 1067f8c..0000000
--- a/portainer/compose.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-services:
-  portainer:
-    image: portainer/portainer-ce:latest
-    container_name: portainer
-    ports:
-      - 9000:9000
-    volumes:
-      - portainer_data:/data
-      - /var/run/docker.sock:/var/run/docker.sock
-    restart: unless-stopped
-    networks:
-      - proxy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.portainer.rule=Host(`portainer.nearfuture`)"
-      - "traefik.http.routers.portainer.entrypoints=web"
-      - "traefik.http.services.portainer.loadbalancer.server.port=9000"
-
-
-networks:
-  proxy:
-    external: true
-
-volumes:
-  portainer_data:
diff --git a/privatebin/compose.yml b/privatebin/compose.yml
new file mode 100644
index 0000000..96b34e9
--- /dev/null
+++ b/privatebin/compose.yml
@@ -0,0 +1,34 @@
+services:
+  privatebin:
+    container_name: privatebin
+    image: privatebin/nginx-fpm-alpine:1.7.4
+    ports:
+      - 1992:8080/tcp
+        # read_only: true
+    volumes:
+      - /home/fejy/docker/privatebin/conf/conf.php:/srv/cfg/conf.php:ro
+      - /home/fejy/docker/privatebin/data:/srv/data
+    user: 1029:1000
+    environment:
+      - PUID=1029
+      - PGID=1000
+    restart: unless-stopped
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.privatebin.rule=Host(`privatebin.nearfuture`)"
+      - "traefik.http.routers.privatebin.entrypoints=web"
+      - "traefik.http.routers.privatebin-ssl.rule=Host(`privatebin.nearfuture`)"
+      - "traefik.http.routers.privatebin-ssl.entrypoints=websecure"
+      - "traefik.http.routers.privatebin-ssl.tls=true"
+      - "traefik.http.routers.privatebin-ssl-ext.rule=Host(`privatebin.nearfuture.industries`)"
+      - "traefik.http.routers.privatebin-ssl-ext.entrypoints=websecure"
+      - "traefik.http.routers.privatebin-ssl-ext.tls=true"
+
+
+networks:
+  proxy:
+    external: true
+
+
diff --git a/tautulli/compose.yml b/tautulli/compose.yml
new file mode 100644
index 0000000..82c3d57
--- /dev/null
+++ b/tautulli/compose.yml
@@ -0,0 +1,24 @@
+services:
+  tautulli:
+    image: ghcr.io/tautulli/tautulli
+    container_name: tautulli
+    volumes:
+      - /home/fejy/docker/tautulli:/config
+    environment:
+      - PUID=1029
+      - PGID=1000
+      - TZ=Etc/UTC
+    ports:
+      - 8181:8181
+    restart: unless-stopped
+    networks:
+      - proxy
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.tautulli.rule=Host(`tautulli.nearfuture`)"
+      - "traefik.http.routers.tautulli.entrypoints=web"
+
+networks:
+  proxy:
+    external: true
+