diff --git a/mastodon/.env b/mastodon/.env
new file mode 100644
index 00000000..7467f780
--- /dev/null
+++ b/mastodon/.env
@@ -0,0 +1,12 @@
+PAPERCLIP_SECRET=foo
+SECRET_KEY_BASE=bar
+OTP_SECRET=foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar
+
+#REDIS_HOST=localhost
+#REDIS_PORT=6379
+
+DB_HOST=127.0.0.1
+DB_NAME=mastodon_dev
+DB_USER=mastodon_dev
+DB_PASS=mastodon_dev
+DB_PORT=5432
diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml
new file mode 100644
index 00000000..259de3ed
--- /dev/null
+++ b/mastodon/docker-compose.yml
@@ -0,0 +1,61 @@
+version: '3'
+services:
+
+  db:
+    restart: always
+    image: postgres:9.6-alpine
+    environment:
+      POSTGRES_USER: mastodon_dev
+      POSTGRES_PASSWORD: mastodon_dev
+      POSTGRES_DB: mastodon_dev
+### Uncomment to enable DB persistance
+#    volumes:
+#      - ./postgres:/var/lib/postgresql/data
+
+  redis:
+    restart: always
+    image: redis:4.0-alpine
+### Uncomment to enable REDIS persistance
+#    volumes:
+#      - ./redis:/data
+
+  web:
+    #build: .
+    image: gargron/mastodon:v2.2.0
+    restart: always
+    env_file: .env
+    command: bundle exec rails s -p 3000 -b '0.0.0.0'
+    ports:
+      - "3000:3000"
+    depends_on:
+      - db
+      - redis
+    volumes:
+      - ./public/assets:/mastodon/public/assets
+      - ./public/packs:/mastodon/public/packs
+      - ./public/system:/mastodon/public/system
+
+  streaming:
+    #build: .
+    image: gargron/mastodon:v2.2.0
+    restart: always
+    env_file: .env
+    command: npm run start
+    ports:
+      - "4000:4000"
+    depends_on:
+      - db
+      - redis
+
+  sidekiq:
+    #build: .
+    image: gargron/mastodon:v2.2.0
+    restart: always
+    env_file: .env
+    command: bundle exec sidekiq -q default -q mailers -q pull -q push
+    depends_on:
+      - db
+      - redis
+    volumes:
+      - ./public/packs:/mastodon/public/packs
+      - ./public/system:/mastodon/public/system
diff --git a/package.json b/package.json
index 50cc6dce..21b42f2f 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "build-svg": "node ./bin/build-svg.js",
     "build-sass": "node ./bin/build-sass.js",
     "build-sass-watch": "node ./bin/build-sass.js --watch",
+    "run-mastodon": "cd mastodon && docker-compose run --rm web rake db:migrate && docker-compose up",
     "cy:run": "cypress run",
     "cy:open": "cypress open",
     "test": "run-p --race dev cy:run",