diff --git a/README.md b/README.md
index 1540999..a3e2ac3 100644
--- a/README.md
+++ b/README.md
@@ -1,22 +1,24 @@
 ganetimgr-docker
 ================
 
 # This creates a container running ganeti.
 # KVM (the kernel module) must be present on the host
 # so /dev/kvm will be passed to the container.
-docker build -t grnet/ganeti ganeti/Dockerfile
-docker run --privileged --name ganeti grnet/ganeti
-
-# Runs ganetimgr in a container.
-# Uses sqlite, no redis and no beanstalkd/watcher by default.
-docker build -t grnet/ganetimgr Dockerfile
-docker run --link ganeti:ganeti -e GANETIMGR_ADMIN_PASS=<pass> -p 80:80 --name ganetimgr grnet/ganetimgr
+cd ganeti
+docker build -t grnet/ganeti .
+docker run --privileged --detach --name ganeti grnet/ganeti
 
 # watcher container - runs a beanstalk tube
 # needs python deps and the ganetimgr project
-docker build -t grnet/ganetimgr-watcher Dockerfile
-docker run --link ganetimgr:ganetimgr --name ganetimgr-watcher grnet/ganetimgr-watcher
+#docker build -t grnet/ganetimgr-watcher watcher-Dockerfile
+#docker run --link ganetimgr:ganetimgr --name ganetimgr-watcher grnet/ganetimgr-watcher
+# Ganetimgr doesn't support non localhost beanstalks so this is integrated in 
+# the main container
 
+# Runs ganetimgr in a container.
+# Uses sqlite, no redis and local beanstalkd/watcher by default.
+docker build -t grnet/ganetimgr .
+docker run --link ganeti:ganeti -e GANETIMGR_ADMIN_PASS=<pass> -p 80:80 --name ganetimgr grnet/ganetimgr
 
 # To get shell access to any of the containers:
 docker exec -ti <cont_name> /bin/bash
diff --git a/docker-compose.yml b/docker-compose.yml
index 1fbcf1f..c074e95 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,33 +1,16 @@
 version: "2"
 
 services:
-
-  beanstalkd:
-    image: agaveapi/beanstalkd
-
-  database:
-    image: mysql
-    environment:
-      MYSQL_ROOT_PASSWORD=
-      MYSQL_USER=ganetimgr
-      MYSQL_PASSWORD=
-      MYSQL_DATABASE=ganetimgr
-
-  worker:
+  ganetimgr:
     build:
       context: .
       dockerfile: Dockerfile
     links:
-      - beanstalkd
       - ganeti
-    depends_on:
-      - database
-      - beanstalkd
     extra_hosts:
       - "ganeti:172.17.0.230"
-
   ganeti:
     build:
       context: ganeti/
       dockerfile: Dockerfile
     privileged: true