diff --git a/ntopng/README.md b/ntopng/README.md
index 02ffe07..1d03fe4 100644
--- a/ntopng/README.md
+++ b/ntopng/README.md
@@ -25,7 +25,7 @@ services:
     image: vimagick/ntopng
     command: --community -d /var/lib/ntopng -i eth0 -r 127.0.0.1:6379@0 -w 0.0.0.0:3000
     volumes:
-      - ./data/ntop:/var/lib/ntopng
+      - ./data/ntopng:/var/lib/ntopng
     network_mode: host
     restart: unless-stopped
 
diff --git a/ntopng/docker-compose-collector.yml b/ntopng/docker-compose-collector.yml
index f9415b4..d07e13a 100644
--- a/ntopng/docker-compose-collector.yml
+++ b/ntopng/docker-compose-collector.yml
@@ -8,7 +8,7 @@ services:
       - "3000:3000"
       - "5556:5556"
     volumes:
-      - ./data/ntop:/var/lib/ntopng
+      - ./data/ntopng:/var/lib/ntopng
     restart: unless-stopped
 
   redis:
diff --git a/ntopng/docker-compose.yml b/ntopng/docker-compose.yml
index 66583bc..6102220 100644
--- a/ntopng/docker-compose.yml
+++ b/ntopng/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     image: vimagick/ntopng
     command: --community -d /var/lib/ntopng -i eth0 -r 127.0.0.1:6379@0 -w 127.0.0.1:3000
     volumes:
-      - ./data/ntop:/var/lib/ntopng
+      - ./data/ntopng:/var/lib/ntopng
     network_mode: host
     restart: unless-stopped
 
diff --git a/rundeck/README.md b/rundeck/README.md
index 02ab228..30d54b0 100644
--- a/rundeck/README.md
+++ b/rundeck/README.md
@@ -25,7 +25,7 @@ Read [this][2] to use more environment variables.
 ## up and running
 
 ```bash
-$ mkdir -p data/{rundeck,ssh}
+$ mkdir -p data/{rundeck,ssh,postgres}
 $ chown -R 1000:1000 data
 $ chmod 700 data/ssh
 $ docker-compose up -d
diff --git a/rundeck/docker-compose.yml b/rundeck/docker-compose.yml
index 1924626..e95a0d4 100644
--- a/rundeck/docker-compose.yml
+++ b/rundeck/docker-compose.yml
@@ -1,11 +1,29 @@
-rundeck:
-  image: rundeck/rundeck:3.0.22
-  ports:
-    - "4440:4440"
-  volumes:
-    - ./data/ssh:/home/rundeck/.ssh
-    - ./data/rundeck:/home/rundeck/server/data
-  environment:
-    - RUNDECK_SECURITY_HTTPHEADERS_ENABLED=false
-  mem_limit: 1024m
-  restart: always
+version: '3.5'
+
+services:
+
+  rundeck:
+    image: rundeck/rundeck:3.0.23
+    ports:
+      - "4440:4440"
+    volumes:
+      - ./data/ssh:/home/rundeck/.ssh
+      - ./data/rundeck:/home/rundeck/server/data
+    environment:
+      - RUNDECK_GRAILS_URL=https://rundeck.easypi.pro
+      - RUNDECK_SECURITY_HTTPHEADERS_ENABLED=true
+      - RUNDECK_DATABASE_DRIVER=org.postgresql.Driver
+      - RUNDECK_DATABASE_URL=jdbc:postgresql://postgres/rundeck
+      - RUNDECK_DATABASE_USERNAME=rundeck
+      - RUNDECK_DATABASE_PASSWORD=rundeck
+    restart: always
+
+  postgres:
+    image: postgres:alpine
+    volumes:
+      - ./data/postgres:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=rundeck
+      - POSTGRES_PASSWORD=rundeck
+      - POSTGRES_DB=rundeck
+    restart: always