diff --git a/.github/workflows/build-kms-image-ko.yml b/.github/workflows/build-keyservice-image-ko.yml
similarity index 87%
rename from .github/workflows/build-kms-image-ko.yml
rename to .github/workflows/build-keyservice-image-ko.yml
index a5b5f6eaa..b8ca10b0d 100644
--- a/.github/workflows/build-kms-image-ko.yml
+++ b/.github/workflows/build-keyservice-image-ko.yml
@@ -1,4 +1,4 @@
-name: Build and upload KMS image (KO)
+name: Build and upload KeyService image (KO)
 env:
   REGISTRY: ghcr.io
 
@@ -10,7 +10,7 @@ on:
       - "release/**"
 
 jobs:
-  build-kms-server:
+  build-keyservice:
     runs-on: ubuntu-22.04
     permissions:
       contents: read
@@ -30,13 +30,13 @@ jobs:
       - name: Set up ko
         uses: imjasonh/setup-ko@9a31684920a610d5dbe8012888714d64706f9787 # tag=v0.6
 
-      - name: Build and upload KMS server container image
+      - name: Build and upload KeyService container image
         id: build-and-upload
         uses: ./.github/actions/build_micro_service_ko
         with:
-          name: kmsserver
+          name: keyservice
           koConfig: .ko.yaml
-          koTarget: ./kms/cmd
+          koTarget: ./keyservice/cmd
           githubToken: ${{ secrets.GITHUB_TOKEN }}
           cosignPublicKey: ${{ startsWith(github.ref, 'refs/heads/release/v') && secrets.COSIGN_PUBLIC_KEY || secrets.COSIGN_DEV_PUBLIC_KEY }}
           cosignPrivateKey: ${{ startsWith(github.ref, 'refs/heads/release/v') && secrets.COSIGN_PRIVATE_KEY || secrets.COSIGN_DEV_PRIVATE_KEY }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8fe8d0305..f9897ce2c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -128,7 +128,7 @@ jobs:
     strategy:
       matrix:
         service:
-          [join-service, kmsserver, verification-service, qemu-metadata-api]
+          [join-service, keyservice, verification-service, qemu-metadata-api]
     with:
       microService: ${{ matrix.service }}
       imageTag: ${{ inputs.version }}
@@ -174,7 +174,7 @@ jobs:
       - name: Update Helm Charts
         run: |
           yq eval -i ".version = \"${WITHOUT_V}\"" cli/internal/helm/charts/edgeless/constellation-services/Chart.yaml
-          for service in kms join-service ccm cnm autoscaler verification-service konnectivity gcp-guest-agent; do
+          for service in keyservice join-service ccm cnm autoscaler verification-service konnectivity gcp-guest-agent; do
             yq eval -i "(.dependencies[] | select(.name == \"${service}\")).version = \"${WITHOUT_V}\"" cli/internal/helm/charts/edgeless/constellation-services/Chart.yaml
             yq eval -i ".version = \"${WITHOUT_V}\"" "cli/internal/helm/charts/edgeless/constellation-services/charts/${service}/Chart.yaml"
             git add "cli/internal/helm/charts/edgeless/constellation-services/charts/${service}/Chart.yaml"
@@ -190,7 +190,7 @@ jobs:
 
       - name: Update micro service versions
         run: |
-          for service in node-operator join-service kmsserver verification-service qemu-metadata-api; do
+          for service in node-operator join-service keyservice verification-service qemu-metadata-api; do
             name=ghcr.io/edgelesssys/constellation/${service}
             digest=$(crane digest "${name}:${VERSION}")
             sed -i "s#\"${name}:v[0-9]\+\.[0-9]\+\.[0-9]\+[^@]*@sha256:[0-9a-f]\+\"#\"${name}:${VERSION}@${digest}\"#" internal/versions/versions.go
diff --git a/.ko.yaml b/.ko.yaml
index 9a1e91376..e42a6f926 100644
--- a/.ko.yaml
+++ b/.ko.yaml
@@ -5,9 +5,9 @@ baseImageOverrides:
   github.com/edgelesssys/constellation/v2/hack/qemu-metadata-api: ghcr.io/edgelesssys/apko-alpine-qemu-metadata-api
 
 builds:
-- id: kms
+- id: keyservice
   dir: .
-  main: ./kms/cmd
+  main: ./keyservice/cmd
   env:
   - CGO_ENABLED=0
   - GOOS=linux