diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index d750389d9..af3fef8e9 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -6,6 +6,13 @@ on:
         description: "Version to release"
         required: true
         type: string
+      release_type:
+        description: "Type of release (base or main)"
+        required: true
+        type: choice
+        options:
+          - base
+          - main
 jobs:
   create_release:
     name: Create Release
@@ -13,7 +20,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: dist
+          name: dist${{ inputs.release_type }}
           path: dist
       - name: Create Release
         uses: ncipollo/release-action@v1
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index 9e5808bec..5f88bffaf 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -67,6 +67,11 @@ jobs:
           else
             make publish main=true
           fi
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist${{ inputs.release_type }}
+          path: dist
 
   call_docker_build:
     name: Call Docker Build Workflow