diff --git a/.github/workflows/ci-build-and-test.yml b/.github/workflows/ci-build-and-test.yml
index 60428ad..9cbe953 100644
--- a/.github/workflows/ci-build-and-test.yml
+++ b/.github/workflows/ci-build-and-test.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         platform:
           - amd64
-          # - arm64
+          - arm64
     env:
       DOCKER_BUILDKIT: 1
     steps:
@@ -57,6 +57,18 @@ jobs:
         with:
           image: lottie-to-webp:${{ matrix.platform }}
 
+      - name: Extract executable
+        run: |
+          id=$(docker create lottie-to-png:${{ matrix.platform }}) &&
+          docker cp $id:/usr/bin/lottie_to_png bin/ &&
+          docker rm -v $id
+
+      - name: Upload executable as artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: lottie-to-png.linux.${{ matrix.platform }}
+          path: bin/lottie_to_png
+
   test-docker:
     name: Run tests
     needs: build-docker
@@ -70,7 +82,7 @@ jobs:
           - webp
         platform:
           - amd64
-          # - arm64
+          - arm64
     steps:
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -181,10 +193,10 @@ jobs:
         run: cmake -DCMAKE_BUILD_TYPE=Release CMakeLists.txt && cmake --build . --config Release
         continue-on-error: true
 
-      - name: Upload artifact
+      - name: Upload executable as artifact
         uses: actions/upload-artifact@v3
         with:
-          name: lottie-to-png.win.amd64.exe
+          name: lottie-to-png.windows.amd64.exe
           path: bin/Release/lottie_to_png.exe
 
   test-windows:
@@ -209,7 +221,7 @@ jobs:
       - name: Download artifact
         uses: actions/download-artifact@v3
         with:
-          name: lottie-to-png.win.amd64.exe
+          name: lottie-to-png.windows.amd64.exe
           path: bin
 
       - name: Run tests
@@ -227,31 +239,30 @@ jobs:
           name: test-results.windows.amd64.${{ matrix.case }}
           path: test-files
 
-  release-linux:
-    name: Release linux executables
+  release:
+    name: Release executables
     needs:
+      - test-darwin
+      - test-windows
       - test-docker
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        platform:
-          - amd64
-          - arm64
+        file:
+          - linux.amd64
+          - linux.arm64
+          - darwin.amd64
+          - windows.amd64.exe
     env:
-      filename: lottie-converter.linux.${{ matrix.platform }}.zip
+      filename: lottie-converter.${{ matrix.file }}.zip
     steps:
-      - name: Download image as artefact
-        uses: ishworkh/docker-image-artifact-download@v2.0.1
-        with:
-          image: lottie-to-png:${{ matrix.platform }}
-
       - uses: actions/checkout@v3
 
       - name: Extract
-        run: |
-          id=$(docker create lottie-to-png:${{ matrix.platform }}) &&
-          docker cp $id:/usr/bin/lottie_to_png bin/ &&
-          docker rm -v $id
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          name: lottie-to-png.${{ matrix.file }}
+          path: bin
 
       - name: Archive Release
         uses: thedoctor0/zip-release@0.7.1
@@ -265,21 +276,3 @@ jobs:
         with:
           files: ${{ env.filename }}
           draft: true
-
-  release-darwin:
-    name: Release darwin executables
-    needs:
-      - test-darwin
-    runs-on: ubuntu-latest
-    steps:
-      - name: Extract
-        run: echo stub
-
-  release-windows:
-    name: Release windows executables
-    needs:
-      - test-windows
-    runs-on: ubuntu-latest
-    steps:
-      - name: Extract
-        run: echo stub