diff --git a/Dockerfile b/Dockerfile
index 06f0a5753d560ea999b0ed9304ebc17a7f64bb90..3f0454938f668b7c85b4cd01b323a23b06b77bcf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM archlinux/base
 
 RUN pacman -Sy --noconfirm
-RUN pacman -S --noconfirm ruby git
+RUN pacman -S --noconfirm ruby git base-devel glibc
 RUN gem install --no-user-install bundler
 
 # throw errors if Gemfile has been modified since Gemfile.lock
diff --git a/README.rdoc b/README.rdoc
index 5575c37760b0e4e734108a6c3cba14e43171910f..e89e868ddfffc7d94c2c802f97875183ea8a23e8 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -33,11 +33,10 @@ Just run the application with the following command.
 
 == Using Docker
 
-    docker run --rm -i -v "$PWD/storage:/usr/src/app/storage" -v "$PWD/conf:/usr/src/app/conf" -v "$PWD/lib/aethyr/extensions/reactions:/usr/src/app/lib/aethyr/extensions/reactions" -t syncleus/aethyr:git bundle exec ./bin/aethyr_setup
-    docker run -p 8888:8888 -v "$PWD/storage:/usr/src/app/storage" -v "$PWD/conf:/usr/src/app/conf" -v "$PWD/lib/aethyr/extensions/reactions:/usr/src/app/lib/aethyr/extensions/reactions" --rm syncleus/aethyr:git
+    UID=${UID} GID=${GID} docker-compose run --rm -- aethyr bundle exec ./bin/aethyr_setup
+    UID=${UID} GID=${GID} docker-compose up 
 
 == Building image
  
-    docker build -t syncleus/aethyr:git .
-    docker login # if not logged in
-    docker push syncleus/aethyr:git
+    UID=${UID} GID=${GID} docker-compose build
+    UID=${UID} GID=${GID} docker-compose push
diff --git a/conf/config.yaml b/conf/config.yaml
index af129658ac2bfb40d3b0178a154c0fe8ddd875b8..44a01d7db5dcfe17c0a74091d44153e62e4ca758 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -9,7 +9,7 @@
 :restart_delay: 10
 :address: 0.0.0.0
 :intro_file: intro.txt
-:start_room: 46cf2781-1e5e-d6e4-18e6-ea72ea437aa9
+:start_room: d135e078-019a-1a4d-be5c-a37aa5304022
 :restart_limit: 15
 :mccp: false
 :mssp: false
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..144b6606ed81a93578532f3d170e68345cc54560
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '2'
+services:
+  aethyr:
+    image: 'borea/aethyr:latest'
+    build: .
+    ports:
+      - "8888:8888"
+    volumes:
+      - "$PWD/storage:/usr/src/app/storage" 
+      - "$PWD/conf:/usr/src/app/conf"
+      - "$PWD/lib/aethyr/extensions/reactions:/usr/src/app/lib/aethyr/extensions/reactions"
+      - "$PWD/logs:/usr/src/app/logs"      
+    user: "${UID}:${GID}"