diff --git a/custom/invidious-db/Dockerfile b/custom/invidious-db/Dockerfile
index 2c95588..d5e927d 100644
--- a/custom/invidious-db/Dockerfile
+++ b/custom/invidious-db/Dockerfile
@@ -5,11 +5,10 @@ RUN apt update && apt install -y \
 
 RUN git clone https://github.com/iv-org/invidious /tmp/invidious
 RUN mkdir -p /config
-RUN cp -r /tmp/invidious/docker/init-invidious-db.sh /docker-entrypoint-initdb.d/init-invidious-db.sh
 RUN cp -r /tmp/invidious/config/sql /config/sql
+RUN cp -r /tmp/invidious/docker/init-invidious-db.sh /docker-entrypoint-initdb.d/init-invidious-db.sh
 
 ENV POSTGRES_DB=invidious_db
 ENV POSTGRES_USER=invidious_username
 ENV POSTGRES_PASSWORD=invidious_password
 
-HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
diff --git a/docker-compose.utils.yml b/docker-compose.utils.yml
index 839cdf2..38c8198 100644
--- a/docker-compose.utils.yml
+++ b/docker-compose.utils.yml
@@ -205,7 +205,13 @@ services:
     restart: unless-stopped
     volumes:
       - invidious-pgdata:/var/lib/postgresql/data
-      
+    environment:
+      POSTGRES_DB: invidious
+      POSTGRES_USER: invidious
+      POSTGRES_PASSWORD: invidious
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
+
 volumes:
   invidious-pgdata: