diff --git a/Complement.Dockerfile b/Complement.Dockerfile
index 43a45e967e19be90d39f411435a878a6e7ff6545..82aade1c80a48c06646802049a983e2c4daa424c 100644
--- a/Complement.Dockerfile
+++ b/Complement.Dockerfile
@@ -30,6 +30,7 @@ RUN dos2unix /usr/local/bin/complement.sh /usr/local/bin/complement-run.sh
 
 EXPOSE 8008
 EXPOSE 8448
+HEALTHCHECK CMD curl --fail http://localhost:8008/_matrix/media/version || exit 1
 
 RUN chmod +x /usr/local/bin/complement.sh
 RUN chmod +x /usr/local/bin/complement-run.sh
diff --git a/docker/complement-run.sh b/docker/complement-run.sh
index 9dbef054d412295c606bb64226f5508374c6e0d1..39d0582c2194c98f20845abee261352d62e813fd 100644
--- a/docker/complement-run.sh
+++ b/docker/complement-run.sh
@@ -2,6 +2,6 @@
 openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=${SERVER_NAME}" -keyout /data/server.key  -out /data/server.crt
 sed -i "s/SERVER_NAME/${SERVER_NAME}/g" /data/media-repo.yaml
 su postgres -c "postgres -h 0.0.0.0" &
-sleep 12
+sleep 16
 /usr/local/bin/media_repo &
 /usr/local/bin/complement_hs