diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 71a1d3b1af..bb1d9a0dc9 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -10,10 +10,14 @@ runs:
     - name: Normalize cache key
       id: cache-key
       shell: bash
+      env:
+        ADDITIONAL_CACHE_KEY: ${{ inputs.additional-cache-key }}
       run: |
-        key="${{ inputs.additional-cache-key }}"
+        key="${ADDITIONAL_CACHE_KEY}"
         key="${key// /-}"
         key="${key//\//-}"
+        key="${key//$'\n'/}"
+        key="${key//$'\r'/}"
         echo "key=${key}" >> "$GITHUB_OUTPUT"
     - name: Setup rust cache
       uses: Swatinem/rust-cache@f13886b937689c021905a6b90929199931d60db1 # v2.8.1
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4bc67faf84..d24ef9d52a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -35,12 +35,14 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - name: Specify Target
         id: target-spec
+        env:
+          INPUT_TARGET: ${{ inputs.target }}
         run: |
-          export TARGET="${{ inputs.target }}"
+          export TARGET="${INPUT_TARGET}"
           if [[ -z $TARGET ]]; then
               export TARGET="${GIT_REF_NAME%/*}"
           fi
-          echo "Target: $TARGET"
+          echo "Target: "$INPUT_TARGET"
           echo "target=$TARGET" >> $GITHUB_OUTPUT
       - name: Create matrix
         id: platforms