diff --git a/firefly/docker-compose.yml b/firefly/docker-compose.yml
index 73a8f98..694ecb9 100644
--- a/firefly/docker-compose.yml
+++ b/firefly/docker-compose.yml
@@ -32,6 +32,7 @@ services:
     db:
         image: 'postgres:13.2-alpine'
         restart: 'always'
+
         healthcheck:
             test: 'pg_isready -U firefly'
             interval: '10s'
diff --git a/miniflux/miniflux.env.example b/miniflux/.env.example
similarity index 63%
rename from miniflux/miniflux.env.example
rename to miniflux/.env.example
index 161f6c8..0a429a9 100644
--- a/miniflux/miniflux.env.example
+++ b/miniflux/.env.example
@@ -1,5 +1,4 @@
 # Database settings
-DATABASE_URL=postgres://miniflux:changeme@db/miniflux?sslmode=disable
 RUN_MIGRATIONS=1
 
 # Auto-create admin user
diff --git a/miniflux/db.env.example b/miniflux/db.env.example
deleted file mode 100644
index 79ebaff..0000000
--- a/miniflux/db.env.example
+++ /dev/null
@@ -1,3 +0,0 @@
-POSTGRES_DB=miniflux
-POSTGRES_USER=miniflux
-POSTGRES_PASSWORD=changeme
diff --git a/miniflux/docker-compose.yml b/miniflux/docker-compose.yml
index 4a59057..24aae5a 100644
--- a/miniflux/docker-compose.yml
+++ b/miniflux/docker-compose.yml
@@ -1,28 +1,44 @@
-version: '3.5'
+version: '2.4'
 
 services:
     app:
-        image: 'miniflux/miniflux:latest'
+        image: 'miniflux/miniflux:2.0.29'
         restart: 'always'
 
         depends_on:
-            - 'db'
+            db:
+                condition: 'service_healthy'
+        healthcheck:
+            test: 'wget --no-verbose --tries=1 --spider http://localhost:8080/ || exit 1'
+            interval: '1m'
+            timeout: '5s'
+            retries: 3
+            start_period: '5s'
+
         env_file:
-            - 'miniflux.env'
-        labels:
-            - 'com.centurylinklabs.watchtower.enable=true'
+            - '.env'
+        environment:
+            # This is always the same, so we just put it here
+            - 'DATABASE_URL=postgres://miniflux:miniflux@db/miniflux?sslmode=disable'
         networks:
             - 'default'
             - 'nginx'
     
     db:
-        image: 'postgres:13-alpine'
+        image: 'postgres:13.2-alpine'
         restart: 'always'
 
-        env_file:
-            - 'db.env'
-        labels:
-            - 'com.centurylinklabs.watchtower.enable=true'
+        healthcheck:
+            test: 'pg_isready -U miniflux'
+            interval: '10s'
+            timeout: '5s'
+            retries: 5
+            start_period: '0s'
+
+        environment:
+            - 'POSTGRES_DB=miniflux'
+            - 'POSTGRES_USER=miniflux'
+            - 'POSTGRES_PASSWORD=miniflux'
         volumes:
             - 'db-data:/var/lib/postgresql/data'