diff --git a/rocketchat/docker-compose.yml b/rocketchat/docker-compose.yml
index d541495..3ac64ba 100644
--- a/rocketchat/docker-compose.yml
+++ b/rocketchat/docker-compose.yml
@@ -18,8 +18,6 @@ volumes:
   rocketchat-dump:
   rocketchat-scripts:
 
-version: '2'
-
 services:
   rocketchat:
     image: rocketchat/rocket.chat:latest
@@ -99,4 +97,3 @@ services:
       - rocketchat-scripts:/home/hubot/scripts
     networks:
       - admin_web
-      
diff --git a/wallabag/docker-compose.yml b/wallabag/docker-compose.yml
new file mode 100644
index 0000000..bfcba5d
--- /dev/null
+++ b/wallabag/docker-compose.yml
@@ -0,0 +1,59 @@
+---
+version: '3'
+
+networks:
+  admin_web:
+    external:
+      name: admin_web
+
+volumes:
+  wallabag:
+
+services:
+
+  wallabag:
+    #https://hub.docker.com/r/wallabag/wallabag
+    image: wallabag/wallabag:${WALLABAG_V}
+    environment:
+      - MYSQL_ROOT_PASSWORD=${WALLABAG_MYSQL_ROOT_PASSWORD}
+      - SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql
+      - SYMFONY__ENV__DATABASE_HOST=${PREFIX}_wallabag-db_1
+      - SYMFONY__ENV__DATABASE_PORT=3306
+      - SYMFONY__ENV__DATABASE_NAME=wallabag
+      - SYMFONY__ENV__DATABASE_USER=wallabag
+      - SYMFONY__ENV__DATABASE_PASSWORD=${WALLABAG_MYSQL_PASSWORD}
+      - SYMFONY__ENV__DATABASE_CHARSET=utf8mb4
+      - SYMFONY__ENV__MAILER_HOST=127.0.0.1
+      - SYMFONY__ENV__MAILER_USER=~
+      - SYMFONY__ENV__MAILER_PASSWORD=~
+      - SYMFONY__ENV__FROM_EMAIL=wallabag@example.com
+      - SYMFONY__ENV__DOMAIN_NAME=https://${WALLABAG_DOMAIN_NAME}
+    volumes:
+      - wallabag:/var/www/wallabag/web/assets/images
+    networks:
+      - admin_web
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.${PREFIX}_wallabag.rule=Host(`${WALLABAG_DOMAIN_NAME}`)"
+      - "traefik.http.routers.${PREFIX}_wallabag.entrypoints=websecure"
+      - "traefik.http.routers.${PREFIX}_wallabag.tls.certresolver=letsencrypt"
+      - "traefik.http.services.${PREFIX}_wallabag.loadbalancer.server.port=80"
+
+  wallabag-db:
+    image: mariadb:${DB_V}
+    restart: always
+    volumes:
+      - bookstack-db:/var/lib/mysql
+    networks:
+      - admin_web
+    command: --max_allowed_packet=32505856
+    environment:
+      MYSQL_ROOT_PASSWORD: ${WALLABAG_MYSQL_ROOT_PASSWORD}
+      MYSQL_USER: wallabag
+      MYSQL_PASSWORD: ${WALLABAG_MYSQL_PASSWORD}
+      MYSQL_DATABASE: wallabag
+
+  wallabag-redis:
+    image: redis:alpine:5.0.9
+    networks:
+      - admin_web
diff --git a/wallabag/env-sample b/wallabag/env-sample
new file mode 100644
index 0000000..90136a0
--- /dev/null
+++ b/wallabag/env-sample
@@ -0,0 +1,11 @@
+# Domains & Project
+PREFIX=p1
+BOOKSTACK_DOMAIN_NAME=bookstack.nickyeoman.com
+
+# Passwords
+BOOKSTACK_MYSQL_ROOT_PASSWORD=ChangeMe2ASecurepass!
+BOOKSTACK_MYSQL_PASSWORD=Again2ASecurepass!
+
+# Software versions
+DB_V=10.4.11
+BOOKSTACK_V=0.29.0