diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..27c4278b27230114d6a92c0b3754340cf70a2d44
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,11 @@
+---
+version: '3.0'
+services:
+  database:
+    image: git.ia2.inaf.it:5050/zorba/vollt-private-rows-demo/database
+    ports:
+    - "5432:5432"
+  tomcat:
+    image: git.ia2.inaf.it:5050/zorba/vollt-private-rows-demo/tomcat
+    ports:
+    - "8080:8080"
diff --git a/war/tap.properties b/war/tap.properties
index a4247e2c8b21359b3ac9c2637a6b2556f1edc6ba..04ba43399a14dd6e35478d30ee68291670618ef8 100644
--- a/war/tap.properties
+++ b/war/tap.properties
@@ -1,10 +1,9 @@
 database_access = jdbc
 jdbc_driver = org.postgresql.Driver
-jdbc_url = jdbc:postgresql:127.0.0.1:5439
+jdbc_url = jdbc:postgresql://database:5432/postgres
 db_username = tap
 db_password = demo
 sql_translator = postgres
-datasource_jndi_name = java:comp/env/jdbc/aao
 metadata = db
 file_manager = local
 file_root_path = /tmp