diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml
deleted file mode 100644
index e16c74df..00000000
--- a/.github/workflows/artifacts.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-name: Libstorage artifacts
-
-on:
-  push:
-    tags:
-      - "v*"
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ${{ matrix.target.os }}
-    strategy:
-      matrix:
-        target:
-          - os: ubuntu-latest
-            cpu: amd64
-            lib_ext: so
-
-          - os: ubuntu-24.04-arm
-            cpu: arm64
-            lib_ext: so
-
-          - os: macos-latest
-            lib_ext: dylib
-            cpu: arm64
-
-          - os: windows-latest
-            cpu: amd64
-            lib_ext: dll
-
-    steps:
-      - name: Check out sources
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: MSYS2 (Windows amd64)
-        if: matrix.target.os == 'windows-latest' && matrix.target.cpu == 'amd64'
-        uses: msys2/setup-msys2@v2
-        with:
-          path-type: inherit
-          msystem: UCRT64
-          install: >-
-            base-devel
-            git
-            mingw-w64-ucrt-x86_64-toolchain
-            mingw-w64-ucrt-x86_64-cmake
-            mingw-w64-ucrt-x86_64-ntldd-git
-
-      - name: MSYS2 post-setup
-        if: matrix.target.os == 'windows-latest' && matrix.target.cpu == 'amd64'
-        shell: msys2 {0}
-        run: |
-          pacman -Sy --noconfirm make
-          git config --global core.symlinks false
-
-      - name: Build libstorage (Linux)
-        if: matrix.target.lib_ext == 'so'
-        run: |
-          make -j${ncpu} update
-          make -j${ncpu} libstorage
-
-      - name: Build libstorage (MacOS)
-        if: matrix.target.os == 'macos-latest'
-        run: |
-          make -j${ncpu} update
-          STORAGE_LIB_PARAMS="--passL:\"-Wl,-install_name,@rpath/libstorage.dylib\"" make -j${ncpu} libstorage
-
-      - name: Build libstorage (Windows)
-        if: matrix.target.os == 'windows-latest'
-        shell: msys2 {0}
-        run: |
-          make -j${ncpu} update
-          make -j${ncpu} libstorage
-
-      - name: Package artifacts Linux
-        if: matrix.target.os == 'ubuntu-latest' || matrix.target.os == 'ubuntu-24.04-arm'
-        run: |
-          sudo apt-get update && sudo apt-get install -y zip
-          ZIPFILE=storage-linux-${{ matrix.target.cpu }}.zip
-          zip -j $ZIPFILE ./build/libstorage.${{ matrix.target.lib_ext }} ./library/libstorage.h
-          echo "ZIPFILE=$ZIPFILE" >> $GITHUB_ENV
-
-      - name: Package artifacts MacOS
-        if: matrix.target.os == 'macos-latest'
-        run: |
-          ZIPFILE=storage-macos-${{ matrix.target.cpu }}.zip
-          zip -j $ZIPFILE ./build/libstorage.${{ matrix.target.lib_ext }} ./library/libstorage.h
-          echo "ZIPFILE=$ZIPFILE" >> $GITHUB_ENV
-
-      - name: Package artifacts (Windows)
-        if: matrix.target.os == 'windows-latest'
-        shell: msys2 {0}
-        run: |
-          ZIPFILE=storage-windows-${{ matrix.target.cpu }}.zip
-          (cd ./build && 7z a -tzip "${GITHUB_WORKSPACE}/${ZIPFILE}" libstorage.dll)
-          (cd ./library && 7z a -tzip "${GITHUB_WORKSPACE}/${ZIPFILE}" libstorage.h)
-          echo "ZIPFILE=$ZIPFILE" >> $GITHUB_ENV
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.ZIPFILE }}
-          path: ${{ env.ZIPFILE }}
-          if-no-files-found: error
-
-  publish-release:
-    needs: build
-    runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
-    steps:
-      - name: Check out sources
-        uses: actions/checkout@v4
-      - name: Download artifacts
-        uses: actions/download-artifact@v5
-        with:
-          path: dist
-      - name: Create release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: dist/**
-          draft: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d6624a43..01e81f8e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -80,6 +80,25 @@ jobs:
         run: |
           make NIMFLAGS="--out:${{ env.build_dir }}/${{ env.storage_binary }} ${{ env.nim_flags }}"
 
+      - name: Release - Build libstorage (Linux)
+        if: matrix.os == 'linux'
+        run: |
+          make -j${ncpu} update
+          make -j${ncpu} libstorage
+
+      - name: Release - Build libstorage (MacOS)
+        if: matrix.os == 'macos'
+        run: |
+          make -j${ncpu} update
+          STORAGE_LIB_PARAMS="--passL:\"-Wl,-install_name,@rpath/libstorage.dylib\"" make -j${ncpu} libstorage
+
+      - name: Release - Build libstorage (Windows)
+        if: matrix.os == 'windows'
+        shell: msys2 {0}
+        run: |
+          make -j${ncpu} update
+          make -j${ncpu} libstorage
+
       - name: Release - Libraries
         run: |
           if [[ "${{ matrix.os }}" == "windows" ]]; then
@@ -103,6 +122,37 @@ jobs:
           path: ${{ env.build_dir }}/*.dll
           retention-days: 30
 
+      - name: Release -Package artifacts Linux
+        if: matrix.os == 'linux'
+        run: |
+          sudo apt-get update && sudo apt-get install -y zip
+          ZIPFILE=storage-linux-${{ matrix.cpu }}.zip
+          zip -j $ZIPFILE ./build/libstorage.so ./library/libstorage.h
+          echo "ZIPFILE=$ZIPFILE" >> $GITHUB_ENV
+
+      - name: Package artifacts MacOS
+        if: matrix.os == 'macos'
+        run: |
+          ZIPFILE=storage-macos-${{ matrix.cpu }}.zip
+          zip -j $ZIPFILE ./build/libstorage.dylib ./library/libstorage.h
+          echo "ZIPFILE=$ZIPFILE" >> $GITHUB_ENV
+
+      - name: Release - Package artifacts (Windows)
+        if: matrix.os == 'windows'
+        shell: msys2 {0}
+        run: |
+          ZIPFILE=storage-windows-${{ matrix.cpu }}.zip
+          (cd ./build && 7z a -tzip "${GITHUB_WORKSPACE}/${ZIPFILE}" libstorage.dll)
+          (cd ./library && 7z a -tzip "${GITHUB_WORKSPACE}/${ZIPFILE}" libstorage.h)
+          echo "ZIPFILE=$ZIPFILE" >> $GITHUB_ENV
+
+      - name: Release - Upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.ZIPFILE }}
+          path: ${{ env.ZIPFILE }}
+          if-no-files-found: error
+
   # Release
   release:
     runs-on: ubuntu-latest
@@ -116,6 +166,12 @@ jobs:
           merge-multiple: true
           path: /tmp/release
 
+      - name: Release - Download artifacts
+        uses: actions/download-artifact@v5
+        with:
+          pattern: libstorage*
+          path: /tmp/release
+
       - name: Release - Compress and checksum
         run: |
           cd /tmp/release