diff --git a/Dockerfile b/Dockerfile
index 44a6d53f..1cd47e1c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,7 @@ EXPOSE 8082
 RUN mkdir -p /commafeed/data
 VOLUME /commafeed/data
 ENV CF_SESSION_PATH=/commafeed/data/sessions
+ENV CF_DATABASE_URL=jdbc:h2:/commafeed/data/db
 
 COPY commafeed-server/config.yml.example config.yml
 COPY commafeed-server/target/commafeed.jar .
diff --git a/commafeed-server/config.dev.yml b/commafeed-server/config.dev.yml
index eda8840e..64a4a87c 100644
--- a/commafeed-server/config.dev.yml
+++ b/commafeed-server/config.dev.yml
@@ -92,7 +92,7 @@ app:
 
 database:
   driverClass: org.h2.Driver
-  url: jdbc:h2:./target/example
+  url: jdbc:h2:./target/commafeed
   user: sa
   password: sa
   properties:
diff --git a/commafeed-server/config.yml.example b/commafeed-server/config.yml.example
index d332b875..3030e90f 100644
--- a/commafeed-server/config.yml.example
+++ b/commafeed-server/config.yml.example
@@ -93,7 +93,7 @@ app:
 
 database:
   driverClass: org.h2.Driver
-  url: jdbc:h2:/commafeed/data/db
+  url: jdbc:h2:./db/commafeed
   user: sa
   password: sa
   properties: