diff --git a/roles/miniflux/defaults/main.yml b/roles/miniflux/defaults/main.yml
index 61bfc79..b57d96f 100644
--- a/roles/miniflux/defaults/main.yml
+++ b/roles/miniflux/defaults/main.yml
@@ -10,7 +10,7 @@ miniflux_use_https: true
 subdomain_alias: rss
 
 # Should ideally be overwritten in encrypted group/host vars
-miniflux_admin_username: MyAdmin
-miniflux_admin_password: MyPassword
-miniflux_postgres_user: MyPostgresUser
-miniflux_postgres_password: MyPostgresPassword
+miniflux_admin_username: myadmin
+miniflux_admin_password: mypassword
+miniflux_postgres_user: myminifluxdbuser
+miniflux_postgres_password: myminifluxdbpassword
diff --git a/roles/miniflux/templates/docker-stack.yml.j2 b/roles/miniflux/templates/docker-stack.yml.j2
index 4481c75..7af9ed7 100644
--- a/roles/miniflux/templates/docker-stack.yml.j2
+++ b/roles/miniflux/templates/docker-stack.yml.j2
@@ -13,7 +13,7 @@ services:
         retries: 3
         start_period: 1m
     environment:
-      - DATABASE_URL=postgres://{{ miniflux_postgres_user }}:{{ miniflux_postgres_password }}@db/miniflux?sslmode=disable
+      - DATABASE_URL=postgres://{{ miniflux_postgres_user }}:{{ miniflux_postgres_password }}@db/{{ miniflux_postgres_user }}?sslmode=disable
       - RUN_MIGRATIONS=1
       - CREATE_ADMIN=1
       - ADMIN_USERNAME={{ miniflux_admin_username }}