diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml
index 9b9a07cb..c8a3f388 100644
--- a/.github/workflows/semantic-release.yml
+++ b/.github/workflows/semantic-release.yml
@@ -101,7 +101,7 @@ jobs:
             build-args: "dev=0"
           - name: mcp-server
             dockerfile: services/mcp-server/Dockerfile
-            image: rag-mcp
+            image: mcp-server
             build-args: "dev=0"
           - name: frontend
             dockerfile: services/frontend/apps/chat-app/Dockerfile
diff --git a/Tiltfile b/Tiltfile
index ee8da8ac..b25ae682 100644
--- a/Tiltfile
+++ b/Tiltfile
@@ -189,7 +189,7 @@ local_resource(
 ################################## build mcp image and do live update ##################################################
 # NOTE: full image names should match the one in the helm chart values.yaml!
 registry = "ghcr.io/stackitcloud/rag-template"
-mcp_image_name = "rag-mcp"
+mcp_image_name = "mcp-server"
 
 mcp_context = "./services/mcp-server"
 mcp_full_image_name = "%s/%s" % (registry, mcp_image_name)