diff --git a/template/{{ part_dir }}/Makefile.jinja b/template/{{ part_dir }}/Makefile.jinja
index 4e4c4d4..ed79bea 100644
--- a/template/{{ part_dir }}/Makefile.jinja	
+++ b/template/{{ part_dir }}/Makefile.jinja	
@@ -1,5 +1,5 @@
 COMPOSE := {% if layout == 'part' %}cd .. && {% endif %}docker compose
-IMAGE := {{ project_slug }}/{{ part }}
+IMAGE := {{ project_slug | replace('_', '-') }}/{{ part }}
 changed = ! git diff --quiet $(1) -- $(2) 2>/dev/null
 stamp = { git update-ref $(1) HEAD 2>/dev/null || true; }
 
diff --git a/template/{{ part_dir }}/docker-compose.yml.jinja b/template/{{ part_dir }}/docker-compose.yml.jinja
index 44b6e0c..aea81d9 100644
--- a/template/{{ part_dir }}/docker-compose.yml.jinja	
+++ b/template/{{ part_dir }}/docker-compose.yml.jinja	
@@ -1,7 +1,7 @@
 services:
   {{ service }}:
     build: {{ part_dir }}
-    image: {{ project_slug }}/{{ part }}
+    image: {{ project_slug | replace('_', '-') }}/{{ part }}
     profiles: [{{ service }}, services]
     restart: unless-stopped
     env_file: