diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 68c267712d..ae3c90b61a 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -21,7 +21,7 @@ on:
         description: |
           name of the GHA artifact holding the base OCM Component-Descriptor
           (use `merge-ocm-fragments` action to collect full component-descriptor):
-        value: ${{ jobs.prepare.outputs.component-descriptor }}
+        value: ${{ jobs.prepare.outputs.component-descriptor-artefact }}
 
 jobs:
   prepare:
diff --git a/.github/workflows/prepare.yaml b/.github/workflows/prepare.yaml
index 51985c16d4..25222aa6ca 100644
--- a/.github/workflows/prepare.yaml
+++ b/.github/workflows/prepare.yaml
@@ -187,15 +187,10 @@ on:
           It is output using the `capture-commit` action, and can be imported using the
           `import-commit` action.
         value: release-commit-objects
-      component-descriptor:
-        description: |
-          The name of the GHA artifact holding the base OCM Component-Descriptor.
-          Deprecated: use component-descriptor-artefact instead.
-        value: ${{ jobs.version-and-ocm.outputs.component-descriptor }}
       component-descriptor-artefact:
         description: |
           The name of the GHA artifact holding the base OCM Component-Descriptor.
-        value: ${{ jobs.version-and-ocm.outputs.component-descriptor }}
+        value: ${{ jobs.version-and-ocm.outputs.component-descriptor-artefact }}
 
 jobs:
   version-and-ocm:
@@ -213,7 +208,7 @@ jobs:
       can-push: ${{ steps.params.outputs.can-push }}
       version: ${{ steps.version.outputs.version }}
       commit-digest: ${{ steps.version.outputs.commit-digest }}
-      component-descriptor: ${{ steps.component-descriptor.outputs.component-descriptor-artifact }}
+      component-descriptor-artefact: ${{ steps.component-descriptor.outputs.component-descriptor-artifact }}
     steps:
       - name: params
         id: params
diff --git a/.github/workflows/upgrade-dependencies.yaml b/.github/workflows/upgrade-dependencies.yaml
index 867b0171f2..43c90ef038 100644
--- a/.github/workflows/upgrade-dependencies.yaml
+++ b/.github/workflows/upgrade-dependencies.yaml
@@ -150,7 +150,7 @@ jobs:
       - uses: gardener/cc-utils/.github/actions/ocm-upgrade@master
         with:
           component-descriptor: ${{ inputs.component-descriptor }}
-          component-descriptor-artifact: ${{ inputs.component-descriptor == '' && needs.prepare.outputs.component-descriptor || '' }}
+          component-descriptor-artifact: ${{ inputs.component-descriptor == '' && needs.prepare.outputs.component-descriptor-artefact || '' }}
           ocm-repositories: |
             ${{ needs.prepare.outputs.ocm-repositories || inputs.ocm-repositories }}
           github-token: ${{ steps.checkout.outputs.token }}