diff --git a/.github/docker-manifests.yml b/.github/docker-manifests.yml
index 935c8199d0..e1872ae974 100644
--- a/.github/docker-manifests.yml
+++ b/.github/docker-manifests.yml
@@ -77,4 +77,4 @@ manifests:
   architectures:
   - amd64
   - arm64
-  artifact-pattern: oci-debian-{arch}/toolshed-echo-v{echo-version}-{arch}.tar
+  artifact-pattern: oci-debian-echo-{arch}/toolshed-echo-v{echo-version}-{arch}.tar
diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml
index ad5f2e071b..2c589cb8c8 100644
--- a/.github/workflows/_docker.yml
+++ b/.github/workflows/_docker.yml
@@ -169,3 +169,11 @@ jobs:
           exit 1
         fi
         docker rm -f toolshed-echo-tls-test
+
+    - name: Upload OCI artifacts
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
+      with:
+        name: oci-debian-echo-${{ inputs.arch }}
+        path: docker/build/oci-output/*.tar
+        retention-days: 1
+        if-no-files-found: error