diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb0f13e20..9fbcb16eb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -52,10 +52,8 @@ jobs:
 
       - name: 'Make artifacts directory'
         run: |
-          rm -rf artifacts
-          rm -rf map_analyser_files
-          mkdir artifacts
-          mkdir map_analyser_files
+          rm -rf artifacts map_analyser_files
+          mkdir artifacts map_analyser_files
 
       - name: 'Bundle scripts'
         if: ${{ !github.event.pull_request.head.repo.fork }}
@@ -66,28 +64,21 @@ jobs:
         run: |
           set -e
           for TARGET in ${TARGETS}; do
-            TARGET="$(echo "${TARGET}" | sed 's/f//')"; \
-            ./fbt TARGET_HW=$TARGET copro_dist updater_package \
-            ${{ startsWith(github.ref, 'refs/tags') && 'DEBUG=0 COMPACT=1' || '' }}
-          done
-
-      - name: 'Move upload files'
-        if: ${{ !github.event.pull_request.head.repo.fork }}
-        run: |
-          set -e
-          for TARGET in ${TARGETS}; do
+            TARGET_HW="$(echo "${TARGET}" | sed 's/f//')"; \
+            ./fbt TARGET_HW=$TARGET_HW copro_dist updater_package \
+              ${{ startsWith(github.ref, 'refs/tags') && 'DEBUG=0 COMPACT=1' || '' }}
             mv dist/${TARGET}-*/* artifacts/
+            tar czpf "artifacts/flipper-z-${TARGET}-resources-${SUFFIX}.tgz" \
+              -C assets resources
+            ./fbt TARGET_HW=$TARGET_HW fap_dist
+            tar czpf "artifacts/flipper-z-${TARGET}-debugapps-${SUFFIX}.tgz" \
+              -C dist/${TARGET}-*/apps/Debug .
           done
 
       - name: "Check for uncommitted changes"
         run: |
           git diff --exit-code
 
-      - name: 'Bundle resources'
-        if: ${{ !github.event.pull_request.head.repo.fork }}
-        run: |
-          tar czpf "artifacts/flipper-z-any-resources-${SUFFIX}.tgz" -C assets resources
-
       - name: 'Bundle core2 firmware'
         if: ${{ !github.event.pull_request.head.repo.fork }}
         run: |
diff --git a/scripts/sconsdist.py b/scripts/sconsdist.py
index 23f9526a0..2cf43dce0 100644
--- a/scripts/sconsdist.py
+++ b/scripts/sconsdist.py
@@ -84,17 +84,6 @@ class Main(App):
             if exists(sdk_folder := join(obj_directory, foldertype)):
                 self.note_dist_component(foldertype, "dir", sdk_folder)
 
-        # TODO: remove this after everyone migrates to new uFBT
-        self.create_zip_stub("lib")
-
-    def create_zip_stub(self, foldertype):
-        with zipfile.ZipFile(
-            self.get_dist_path(self.get_dist_file_name(foldertype, "zip")),
-            "w",
-            zipfile.ZIP_DEFLATED,
-        ) as _:
-            pass
-
     def copy(self) -> int:
         self._dist_components: dict[str, str] = dict()
         self.projects: dict[str, ProjectDir] = dict(