diff --git a/.github/actions/build_micro_service_ko/action.yml b/.github/actions/build_micro_service_ko/action.yml
index 1c241fcfa..75d4d7fc5 100644
--- a/.github/actions/build_micro_service_ko/action.yml
+++ b/.github/actions/build_micro_service_ko/action.yml
@@ -1,4 +1,4 @@
-name: Build micro service
+name: Build micro service (KO)
 description: Build and upload a container image for a Constellation micro-service
 inputs:
   name:
@@ -30,11 +30,12 @@ runs:
       uses: imjasonh/setup-ko@v0.6
 
     - name: Build and upload ko container image
+      shell: bash
       id: build
       env:
         KO_USER: ${{ github.actor }}
         KO_CONFIG_PATH: ${{ inputs.koConfig }}
-        KO_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+        KO_PASSWORD: ${{ inputs.githubToken }}
         KO_DOCKER_REPO: ${{ env.REGISTRY }}/edgelesssys/constellation
         GIT_REF: ${{ github.ref }}
       run: |
diff --git a/.github/workflows/build-kms-image-ko.yml b/.github/workflows/build-kms-image-ko.yml
index 2c3f29f94..d6de32287 100644
--- a/.github/workflows/build-kms-image-ko.yml
+++ b/.github/workflows/build-kms-image-ko.yml
@@ -31,18 +31,6 @@ jobs:
       - name: Set up ko
         uses: imjasonh/setup-ko@v0.6
 
-      - name: Build and upload KMS server container image
-        id: build-and-upload
-        env:
-          KO_USER: ${{ github.actor }}
-          KO_CONFIG_PATH: ${{ github.workspace }}/.ko.yaml
-          KO_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          KO_DOCKER_REPO: ${{ env.REGISTRY }}/edgelesssys/constellation
-          GIT_REF: ${{ github.ref }}
-        run: |
-          tag=$(echo ${GIT_REF} | cut -d'/' -f3)
-          ko build ./kms/cmd --preserve-import-paths -t ${tag}
-
       - name: Build and upload KMS server container image
         id: build-and-upload
         uses: ./.github/actions/build_micro_service_ko