diff --git a/.github/actions/build_micro_service_ko/action.yml b/.github/actions/build_micro_service_ko/action.yml
index 75d4d7fc5..578d56c19 100644
--- a/.github/actions/build_micro_service_ko/action.yml
+++ b/.github/actions/build_micro_service_ko/action.yml
@@ -36,8 +36,8 @@ runs:
         KO_USER: ${{ github.actor }}
         KO_CONFIG_PATH: ${{ inputs.koConfig }}
         KO_PASSWORD: ${{ inputs.githubToken }}
-        KO_DOCKER_REPO: ${{ env.REGISTRY }}/edgelesssys/constellation
+        KO_DOCKER_REPO: ${{ env.REGISTRY }}/edgelesssys/${{ inputs.name }}-ko
         GIT_REF: ${{ github.ref }}
       run: |
         tag=$(echo ${GIT_REF} | cut -d'/' -f3)
-        ko build ${{ inputs.koTarget }} --preserve-import-paths --tags ${tag}
+        ko build ${{ inputs.koTarget }} --bare --tags ${tag}
diff --git a/.github/workflows/build-joinservice-image-ko.yml b/.github/workflows/build-joinservice-image-ko.yml
index 967fc565c..35f1ae395 100644
--- a/.github/workflows/build-joinservice-image-ko.yml
+++ b/.github/workflows/build-joinservice-image-ko.yml
@@ -7,7 +7,7 @@ on:
   push:
 
 jobs:
-  build-kms-server:
+  build-join-service:
     runs-on: ubuntu-22.04
     permissions:
       contents: read
diff --git a/.github/workflows/build-kms-image-ko.yml b/.github/workflows/build-kms-image-ko.yml
index d6de32287..b76b77a07 100644
--- a/.github/workflows/build-kms-image-ko.yml
+++ b/.github/workflows/build-kms-image-ko.yml
@@ -1,7 +1,6 @@
 name: Build and upload KMS image (KO)
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: kmsserver
 
 on:
   workflow_dispatch: