diff --git a/Justfile b/Justfile
index a4982ff..374d798 100644
--- a/Justfile
+++ b/Justfile
@@ -36,7 +36,7 @@ clean-images db=VARIANT:
 # Build image locally
 build db=VARIANT:
   #!/usr/bin/env bash
-  IMAGE="database-{{db}}:latest"
+  IMAGE="db-{{db}}:latest"
   echo "docker build -f {{db}}/Dockerfile -t ${IMAGE} {{db}}"
   docker build -f {{db}}/Dockerfile -t ${IMAGE} {{db}}
 
@@ -45,7 +45,7 @@ push db=VARIANT version=VERSION:
   #!/usr/bin/env bash
   REGISTRY_URL='{{REGISTRY_URL}}'
   PREFIX=${REGISTRY_URL:+${REGISTRY_URL}/}
-  IMAGE="database-{{db}}"
+  IMAGE="db-{{db}}"
   VERSION={{version}}
 
   just build {{db}}
diff --git a/postgres/compose.yml b/postgres/compose.yml
index 34fde3a..659a495 100644
--- a/postgres/compose.yml
+++ b/postgres/compose.yml
@@ -1,7 +1,7 @@
 services:
   postgres:
     # run `just build postgres` first
-    image: database-postgres:latest
+    image: db-postgres:latest
     restart: unless-stopped
     environment:
       POSTGRES_USER: ${POSTGRES_USER:-postgres}
@@ -10,12 +10,7 @@ services:
     ports:
       - "${POSTGRES_PORT:-5432}:5432"
     volumes:
-      - postgres_data:/var/lib/postgresql
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres}"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
+      - postgres-data:/var/lib/postgresql
 
 volumes:
-  postgres_data:
+  postgres-data: