diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 442c2a2f..7ee3cc6d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,8 +6,15 @@ on:
         description: 'Engine release version'
         required: true
         default: "0.0.0"
+      branch:
+        description: 'Release branch name'
+        required: true
+        default: "release-0.0"
   pull_request:
     branches: ["main"]
+env:
+  RELEASE_VERSION: ${{ github.event.inputs.version || 'testrelease' }}
+  BRANCH_NAME: ${{ github.event.inputs.branch || 'main' }}
 jobs:
   build_linux:
     uses: ./.github/workflows/appimage.yml
@@ -25,6 +32,27 @@ jobs:
         path: ./artifacts
     - name: Show Artifacts
       run: |
-        sudo apt install -y tree
-        tree ./artifacts
+        mkdir release
+        mv ./artifacts/AppImage/VoxelCore-latest-x86_64.AppImage \
+           ./release/voxelcore-${RELEASE_VERSION}_x86-64.AppImage
+        mv ./artifacts/VoxelEngineMacOs/VoxelEngineMacApp.dmg \
+           ./release/voxelcore-${RELEASE_VERSION}_macos.dmg
+        zip -r ./release/voxelcore-${RELEASE_VERSION}_win64.zip ./artifacts/Windows-Build/*
+        ls -la ./release
+        tree ./release
+    - name: Create Tag
+      run: |
+        TAG_NAME="v${RELEASE_VERSION}"
+        
+        git switch $BRANCH_NAME
+        git tag -a "${TAG_NAME}" -m "Automated release tag ${TAG_NAME}"
+        git push origin "${TAG_NAME}"
+    - name: Create Release Draft
+      uses: softprops/action-gh-release@v2
+      with:
+        tag_name: v${{ env.RELEASE_VERSION }}
+        draft: true
+        files: ./release/*
+        body: |
+          Auto-generated