diff --git a/apps/api/src/api/tool_instances.py b/apps/api/src/api/tool_instances.py
index 47dc53a..2bff619 100644
--- a/apps/api/src/api/tool_instances.py
+++ b/apps/api/src/api/tool_instances.py
@@ -585,7 +585,7 @@ async def create_instance(
         # Handle based on definition type
         if tool_type.definition_type == "dockerfile":
             # Build image from Dockerfile
-            image_tag = f"headquarter/{instance_name}:latest"
+            image_tag = f"headquarter/{instance_name}:latest".lower()
             
             if tool_type.dockerfile_template:
                 returncode, stdout, stderr = build_image(
@@ -609,7 +609,7 @@ async def create_instance(
 services:
   app:
     image: {image_tag}
-    container_name: {instance_name}
+    container_name: {instance_name.lower()}
     ports:
       - "{tool_port}:{tool_type.default_port}"
     volumes: