diff --git a/.env.example b/.env.example
index b1948f7aa..193e6099e 100644
--- a/.env.example
+++ b/.env.example
@@ -5,5 +5,5 @@
 HD_DOMAIN="http://localhost"
 HD_MEDIA_BACKEND="filesystem"
 HD_MEDIA_BACKEND_FILESYSTEM_UPLOAD_PATH="uploads/"
-HD_DATABASE_DIALECT="sqlite"
-HD_DATABASE_STORAGE="./hedgedoc.sqlite"
+HD_DATABASE_TYPE="sqlite"
+HD_DATABASE_NAME="./hedgedoc.sqlite"
diff --git a/docker/README.md b/docker/README.md
index a1e2d44a4..873053756 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -21,7 +21,7 @@ To build a production image, run the following command *from the root of the rep
 When you run the image, you need to provide environment variables to configure HedgeDoc.
 See [the config docs](../docs/content/config/index.md) for more information.
 This example starts HedgeDoc on localhost, with non-persistent storage:  
-`docker run -e HD_DOMAIN=http://localhost -e HD_MEDIA_BACKEND=filesystem -e HD_MEDIA_BACKEND_FILESYSTEM_UPLOAD_PATH=uploads -e HD_DATABASE_DIALECT=sqlite -e HD_DATABASE_STORAGE=hedgedoc.sqlite -e HD_SESSION_SECRET=foobar -e HD_LOGLEVEL=debug -p 3000:3000 hedgedoc-prod`
+`docker run -e HD_DOMAIN=http://localhost -e HD_MEDIA_BACKEND=filesystem -e HD_MEDIA_BACKEND_FILESYSTEM_UPLOAD_PATH=uploads -e HD_DATABASE_TYPE=sqlite -e HD_DATABASE_NAME=hedgedoc.sqlite -e HD_SESSION_SECRET=foobar -e HD_LOGLEVEL=debug -p 3000:3000 hedgedoc-prod`
 
 
 ## Build a development image
diff --git a/docs/content/config/index.md b/docs/content/config/index.md
index 93c98c097..ee1b06d1b 100644
--- a/docs/content/config/index.md
+++ b/docs/content/config/index.md
@@ -8,8 +8,8 @@ The `.env` file should be placed in the root of the project and contains key-val
 HD_DOMAIN="http://localhost"
 HD_MEDIA_BACKEND="filesystem"
 HD_MEDIA_BACKEND_FILESYSTEM_UPLOAD_PATH="uploads/"
-HD_DATABASE_DIALECT="sqlite"
-HD_DATABASE_STORAGE="./hedgedoc.sqlite"
+HD_DATABASE_TYPE="sqlite"
+HD_DATABASE_NAME="./hedgedoc.sqlite"
 ```
 
 We also provide an `.env.example` file containing a minimal configuration in the root of the project. This should help you to write your own configuration.