diff --git a/docker-compose.yml b/docker-compose.yml
index 6dcca29..596ae85 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,18 +1,15 @@
 
 services:
   postgres:
-    image: postgres:16.8
+    image: postgres
     restart: unless-stopped
     environment:
       - POSTGRES_DB=kontor
       - POSTGRES_USER=kontor
-      - PGUSER=kontor
-      - PGPASSWORD=kontor
-      - PGDATABASE=kontor
       #- POSTGRES_PASSWORD_FILE=/run/secrets/db-password
       - POSTGRES_PASSWORD=kontor
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready", "-q"]
+      test: ["CMD-SHELL", "pg_isready", "-U", "kontor"]
       interval: 1s
       timeout: 5s
       retries: 10
@@ -46,7 +43,7 @@ services:
     volumes:
       - mariadb-storage:/var/lib/mysql:rw
   kontor:
-    image: kontor
+    image: kontor:0.2.0-SNAPSHOT
     restart: unless-stopped
     networks:
       - database
@@ -57,7 +54,7 @@ services:
       postgres:
         condition: service_healthy
   kontor-api:
-    image: kontor-api
+    image: kontor-api:0.2.0-SNAPSHOT
     restart: unless-stopped
     networks:
       - database
diff --git a/kontor-api/Makefile b/kontor-api/Makefile
index 9c05f76..40fbfeb 100644
--- a/kontor-api/Makefile
+++ b/kontor-api/Makefile
@@ -7,7 +7,7 @@ test:
 	DB_HOST=localhost uv run pytest -v --cov --cov-report=term --cov-report=html:coverage-report
 
 docker: clean
-	docker build --target=production -t kontor-api -t kontor-api:0.1.0-SNAPSHOT .
+	docker build --target=production -t kontor-api:0.2.0-SNAPSHOT .
 
 dev:
 	MARIADB_SERVER=localhost uv run fastapi dev src/main.py --port 8008
diff --git a/kontor-spring/build.gradle b/kontor-spring/build.gradle
index c6b203e..844fdc1 100644
--- a/kontor-spring/build.gradle
+++ b/kontor-spring/build.gradle
@@ -156,7 +156,7 @@ bootRun {
 
 task dockerImage(type: Exec) {
     dependsOn(bootJar)
-    commandLine "docker", "build", ".", "-t", "kontor:${project.version}", "-t", "kontor"
+    commandLine "docker", "build", ".", "-t", "kontor:${project.version}"
 }
 
 vaadin {