@@ -106,7 +106,7 @@ services:
     hostname: db
     restart: always
     healthcheck:
-      test: [ "CMD-SHELL", "pg_isready", "-d", "db_prod" ]
+      test: ['CMD-SHELL', ${HEALTHCHECK_TEST_COMMAND}, ${HEALTHCHECK_TEST_ARG_0}, ${HEALTHCHECK_TEST_ARG_1}]
       interval: 30s
       timeout: 60s
       retries: 5
 
@@ -524,21 +524,26 @@ def populate_env(self):
         env_file += f"RABBITMQ_PORT={self.rabbit_port}\n"
 
         if self.local_database:
-            env_file += "POSTGRES_IMAGE=postgres:12.5\n"
+            env_file += "POSTGRES_IMAGE=postgres:16\n"
             env_file += "DATABASE_URL=postgresql+psycopg2://postgres:postgres@db/diffgram\n"
             env_file += "DATABASE_NAME=diffgram\n"
             env_file += "DATABASE_HOST=db\n"
             env_file += "DATABASE_NAME=diffgram\n"
             env_file += "DATABASE_USER=postgres\n"
             env_file += "DATABASE_PASS=postgres\n"
-
+            env_file += "HEALTHCHECK_TEST_COMMAND=pg_isready\n"
+            env_file += "HEALTHCHECK_TEST_ARG_0=-d\n"
+            env_file += "HEALTHCHECK_TEST_ARG_1=db_prod\n"
         else:
             env_file += "POSTGRES_IMAGE=tianon/true\n"
             env_file += f"DATABASE_URL={self.database_url}\n"
             env_file += f"DATABASE_HOST={self.db_host}\n"
             env_file += f"DATABASE_NAME={self.db_name}\n"
             env_file += f"DATABASE_USER={self.db_username}\n"
             env_file += f"DATABASE_PASS={self.db_pass}\n"
+            env_file += "HEALTHCHECK_TEST_COMMAND=echo\n"
+            env_file += "HEALTHCHECK_TEST_ARG_0=remote_db_in_use\n"
+            env_file += "HEALTHCHECK_TEST_ARG_1=none\n"
 
         if self.mailgun:
             env_file += f"MAILGUN_KEY={self.mailgun_key}\n"