diff --git a/mastodon-docker-compose.yml b/mastodon-docker-compose.yml
index e38096c..f0db281 100644
--- a/mastodon-docker-compose.yml
+++ b/mastodon-docker-compose.yml
@@ -1,8 +1,9 @@
 version: "2.1"
 services:
-  mastodon:
-    image: lscr.io/linuxserver/mastodon:latest
-    container_name: mastodon
+  mastodon-web:
+    image: tootsuite/mastodon
+    container_name: mastodon-web
+    command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
     environment:
       - PUID=1000
       - PGID=1000
@@ -44,7 +45,7 @@ services:
     volumes:
       - /usr/docker_binds/mastodon/config:/config
     ports:
-      - 8020:80
+      - 8020:3000
     restart: unless-stopped
     depends_on:
       - mast-db
@@ -52,6 +53,32 @@ services:
     networks:
       - mastodon-net
   
+  mastodon-streaming:
+    image: tootsuite/mastodon
+    container_name: mastodon-streaming
+    restart: unless-stopped
+    command: node ./streaming
+    ports:
+      - 8021:4000
+    networks:
+      - mastodon-net
+    depends_on:
+      - mast-db
+      - mast-redis
+  
+  mastodon-sidekiq:
+    image: tootsuite/mastodon
+    restart: unless-stopped
+    container_name: mastodon-streaming
+    command: bundle exec sidekiq
+    depends_on:
+      - mast-db
+      - mast-redis
+    networks:
+      - mastodon-net
+    volumes:
+      - /usr/docker_binds/mastodon/config/mastodon/public/system:/mastodon/public/system
+
   mast-db:
     image: postgres:15.2
     container_name: mast-db