diff --git a/Dockerfile b/Dockerfile
index 32e80a5..8ada015 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG BUILD_DATE
 LABEL org.label-schema.build-date="$BUILD_DATE" \
       org.label-schema.name="Zammad" \
       org.label-schema.license="AGPL-3.0" \
-      org.label-schema.description="Docker container for Zammad - dummy Dockerfile for DockerHub autobuilds" \
+      org.label-schema.description="Docker container for Zammad - Dummy Dockerfile for DockerHub autobuilds" \
       org.label-schema.url="https://zammad.org" \
       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
       org.label-schema.vcs-type="Git" \
diff --git a/Dockerfile.elasticsearch b/Dockerfile.elasticsearch
index b3c526c..360acf4 100644
--- a/Dockerfile.elasticsearch
+++ b/Dockerfile.elasticsearch
@@ -5,7 +5,7 @@ ARG BUILD_DATE
 LABEL org.label-schema.build-date="$BUILD_DATE" \
       org.label-schema.name="Zammad" \
       org.label-schema.license="AGPL-3.0" \
-      org.label-schema.description="Docker container for Zammad - elasticsearch" \
+      org.label-schema.description="Docker container for Zammad - Elasticsearch" \
       org.label-schema.url="https://zammad.org" \
       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
       org.label-schema.vcs-type="Git" \
diff --git a/Dockerfile.nginx b/Dockerfile.nginx
index 89a06d0..cf0b2e1 100644
--- a/Dockerfile.nginx
+++ b/Dockerfile.nginx
@@ -5,7 +5,7 @@ ARG BUILD_DATE
 LABEL org.label-schema.build-date="$BUILD_DATE" \
       org.label-schema.name="Zammad" \
       org.label-schema.license="AGPL-3.0" \
-      org.label-schema.description="Docker container for Zammad - nginx" \
+      org.label-schema.description="Docker container for Zammad - Nginx" \
       org.label-schema.url="https://zammad.org" \
       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
       org.label-schema.vcs-type="Git" \
diff --git a/Dockerfile.postgresql b/Dockerfile.postgresql
index 1cb955a..02b57ae 100644
--- a/Dockerfile.postgresql
+++ b/Dockerfile.postgresql
@@ -5,7 +5,7 @@ ARG BUILD_DATE
 LABEL org.label-schema.build-date="$BUILD_DATE" \
       org.label-schema.name="Zammad" \
       org.label-schema.license="AGPL-3.0" \
-      org.label-schema.description="Docker container for Zammad - postgresql" \
+      org.label-schema.description="Docker container for Zammad - Postgresql" \
       org.label-schema.url="https://zammad.org" \
       org.label-schema.vcs-url="https://github.com/zammad/zammad" \
       org.label-schema.vcs-type="Git" \
diff --git a/LICENSE b/LICENSE
index 2def0e8..dba13ed 100644
--- a/LICENSE
+++ b/LICENSE
@@ -658,4 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
\ No newline at end of file
+<http://www.gnu.org/licenses/>.
diff --git a/docker-compose.yml b/docker-compose.yml
index ddc4471..ecbff7a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,15 @@
 version: '2'
 services:
   postgresql:
-    image: postgres
+    image: monotek/zammad-docker-compose:postgresql
+    volumes:
+      - data-postgresql:/var/lib/psql
   elasticsearch:
-    build:
-      context: .
-      dockerfile: Dockerfile.elasticsearch
+    image: monotek/zammad-docker-compose:elasticsearch
+    volumes:
+      - data-elasticsearch:/var/lib/elasticsearch
   zammad:
-    build:
-      context: .
-      dockerfile: Dockerfile.zammad
+    image: monotek/zammad-docker-compose:zammad
     links:
       - postgresql
       - elasticsearch
@@ -20,9 +20,7 @@ services:
       - data-zammad:/home/zammad
       - data-ruby:/usr/local
   nginx:
-    build:
-      context: .
-      dockerfile: Dockerfile.nginx
+    image: monotek/zammad-docker-compose:nginx
     ports:
       - "80:80"
     links:
@@ -32,6 +30,8 @@ services:
     volumes:
       - data-zammad:/home/zammad
 volumes:
+  data-elasticsearch:
+    driver: local
   data-postgresql:
     driver: local
   data-ruby: