diff --git a/.env.sample b/.env.sample
index 762994b..2d5556b 100644
--- a/.env.sample
+++ b/.env.sample
@@ -9,6 +9,7 @@ FEDERATION=true
 LOCAL_TIMELINE=false
 OPEN_DELETION=false
 OPEN_REGISTRATION=true
+# This settings requires authentication to read posts
 PRIVATE=true
 PUBLIC_STATS=true
 SITE_DESCRIPTION=
diff --git a/README.md b/README.md
index c9a8c2e..c712236 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,8 @@
 2. Deploy `coop-cloud/traefik`
 3. `abra app new writefreely`
 4. `abra app config <domain>` - be sure to change `<domain>` to something that resolves to
-   your Docker swarm box
+   your coop-cloud server.
+    - For more info about the config options, see the [writefreely docs](https://writefreely.org/docs/main/admin/config).
 5. `abra app deploy <domain>`
 6. Once it's running, if you are not using SSO, set up a local admin user by running this command:
 
diff --git a/compose.yml b/compose.yml
index 89c81eb..18e57f5 100644
--- a/compose.yml
+++ b/compose.yml
@@ -25,6 +25,7 @@ services:
     entrypoint: /abra-entrypoint.sh
     volumes:
       - "web-keys:/go/keys"
+      - "local-data:/go/data"
     networks:
       - internal
       - proxy
@@ -45,6 +46,7 @@ services:
 
 volumes:
   web-keys:
+  local-data:
 
 networks:
   proxy:
diff --git a/config.ini.tmpl b/config.ini.tmpl
index 2f42b4b..aef9a79 100644
--- a/config.ini.tmpl
+++ b/config.ini.tmpl
@@ -14,7 +14,7 @@ gopher_port          = 0
 
 [database]
 type     = {{ if eq (env "USE_MARIADB") "true" }}mysql{{ else }}sqlite3{{ end }}
-filename = {{ if eq (env "USE_MARIADB") "true" }}{{ else }}writefreely.db{{ end }}
+filename = {{ if eq (env "USE_MARIADB") "true" }}{{ else }}data/writefreely.db{{ end }}
 username = {{ if eq (env "USE_MARIADB") "true" }}writeas{{ else }}{{ end }}
 password = {{ if eq (env "USE_MARIADB") "true" }}{{ secret "db_password" }}{{ else }}{{ end }}
 database = {{ if eq (env "USE_MARIADB") "true" }}writefreely{{ else }}{{ end }}
diff --git a/entrypoint.sh b/entrypoint.sh
index 8d99c34..b1a71b0 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,5 +1,11 @@
 #!/bin/sh
-/go/cmd/writefreely/writefreely --gen-keys > /dev/null
-/go/cmd/writefreely/writefreely db init > /dev/null
-/go/cmd/writefreely/writefreely db migrate > /dev/null
+set -e
+
+if [ ! -f ./keys/abra_first_time_setup ]; then
+  echo "Running first-time setup"
+  /go/cmd/writefreely/writefreely --gen-keys
+  /go/cmd/writefreely/writefreely db init
+  touch ./keys/abra_first_time_setup
+fi
+/go/cmd/writefreely/writefreely db migrate
 exec /go/cmd/writefreely/writefreely