diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bd85858a..07b21971 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ env:
 
 jobs:
   main:
-    runs-on: [self-hosted,FlipperZeroShell]
+    runs-on: [self-hosted, FlipperZeroShell]
     steps:
       - name: 'Wipe workspace'
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
@@ -37,7 +37,6 @@ jobs:
             TYPE="other"
           fi
           python3 scripts/get_env.py "--event_file=${{ github.event_path }}" "--type=$TYPE" || cat "${{ github.event_path }}"
-          echo random_hash=$(openssl rand -base64 40 | shasum -a 256 | awk '{print $1}') >> $GITHUB_OUTPUT
           echo "event_type=$TYPE" >> $GITHUB_OUTPUT
 
       - name: 'Check API versions'
@@ -149,72 +148,3 @@ jobs:
             - [📥 DFU file](https://update.flipperzero.one/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-full-${{steps.names.outputs.suffix}}.dfu)
             - [☁️ Web/App updater](https://lab.flipper.net/?url=https://update.flipperzero.one/builds/firmware/${{steps.names.outputs.branch_name}}/flipper-z-${{steps.names.outputs.default_target}}-update-${{steps.names.outputs.suffix}}.tgz&channel=${{steps.names.outputs.branch_name}}&version=${{steps.names.outputs.commit_sha}})
           edit-mode: replace
-
-  compact:
-    if: ${{ !startsWith(github.ref, 'refs/tags') }}
-    runs-on: [self-hosted,FlipperZeroShell]
-    strategy:
-      matrix:
-        target: [f7, f18]
-    steps:
-      - name: 'Wipe workspace'
-        run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
-
-      - name: 'Checkout code'
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
-          submodules: false
-          ref: ${{ github.event.pull_request.head.sha }}
-
-      - name: 'Get commit details'
-        run: |
-          if [[ ${{ github.event_name }} == 'pull_request' ]]; then
-            TYPE="pull"
-          elif [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
-            TYPE="tag"
-          else
-            TYPE="other"
-          fi
-          python3 scripts/get_env.py "--event_file=${{ github.event_path }}" "--type=$TYPE" || cat "${{ github.event_path }}"
-
-      - name: 'Build the firmware'
-        id: build-fw
-        run: |
-          set -e
-          TARGET="$(echo '${{ matrix.target }}' | sed 's/f//')"; \
-          ./fbt TARGET_HW=$TARGET DEBUG=0 COMPACT=1 fap_dist updater_package
-          echo "sdk-file=$(ls dist/${{ matrix.target }}-*/flipper-z-${{ matrix.target }}-sdk-*.zip)" >> $GITHUB_OUTPUT
-          echo "hw-target-code=$TARGET" >> $GITHUB_OUTPUT
-
-      - name: Deploy uFBT with SDK
-        uses: flipperdevices/flipperzero-ufbt-action@v0.1.0
-        with:
-          task: setup
-          sdk-file: ${{ steps.build-fw.outputs.sdk-file }}
-          sdk-hw-target: ${{ steps.build-fw.outputs.hw-target-code }}
-
-      - name: Build test app with SDK
-        run: |
-          mkdir testapp
-          cd testapp
-          ufbt create APPID=testapp
-          ufbt
-
-      - name: Build example & external apps with uFBT
-        run: |
-          for appdir in 'applications/examples'; do
-            for app in $(find "$appdir" -maxdepth 1 -mindepth 1 -type d); do
-              pushd $app
-              TARGETS_FAM=$(grep "targets" application.fam || echo "${{ matrix.target }}")
-              if ! grep -q "${{ matrix.target }}" <<< $TARGETS_FAM ; then
-                  echo Skipping unsupported app: $app
-                  popd
-                  continue
-              fi
-              echo Building $app
-              ufbt
-              popd
-            done
-          done
-
diff --git a/.github/workflows/build_compact.yml b/.github/workflows/build_compact.yml
new file mode 100644
index 00000000..705888a4
--- /dev/null
+++ b/.github/workflows/build_compact.yml
@@ -0,0 +1,75 @@
+name: 'Compact build'
+
+on:
+  pull_request:
+
+env:
+  FBT_TOOLCHAIN_PATH: /runner/_work
+
+jobs:
+  compact:
+    runs-on: [self-hosted, FlipperZeroShell]
+    strategy:
+      matrix:
+        target: [f7, f18]
+    steps:
+      - name: 'Wipe workspace'
+        run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
+
+      - name: 'Checkout code'
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+          submodules: false
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: 'Get commit details'
+        run: |
+          if [[ ${{ github.event_name }} == 'pull_request' ]]; then
+            TYPE="pull"
+          elif [[ "${{ github.ref }}" == "refs/tags/"* ]]; then
+            TYPE="tag"
+          else
+            TYPE="other"
+          fi
+          python3 scripts/get_env.py "--event_file=${{ github.event_path }}" "--type=$TYPE" || cat "${{ github.event_path }}"
+
+      - name: 'Build the firmware'
+        id: build-fw
+        run: |
+          set -e
+          TARGET="$(echo '${{ matrix.target }}' | sed 's/f//')"; \
+          ./fbt TARGET_HW=$TARGET DEBUG=0 COMPACT=1 fap_dist updater_package
+          echo "sdk-file=$(ls dist/${{ matrix.target }}-*/flipper-z-${{ matrix.target }}-sdk-*.zip)" >> $GITHUB_OUTPUT
+          echo "hw-target-code=$TARGET" >> $GITHUB_OUTPUT
+
+      - name: Deploy uFBT with SDK
+        uses: flipperdevices/flipperzero-ufbt-action@v0.1.0
+        with:
+          task: setup
+          sdk-file: ${{ steps.build-fw.outputs.sdk-file }}
+          sdk-hw-target: ${{ steps.build-fw.outputs.hw-target-code }}
+
+      - name: Build test app with SDK
+        run: |
+          mkdir testapp
+          cd testapp
+          ufbt create APPID=testapp
+          ufbt
+
+      - name: Build example & external apps with uFBT
+        run: |
+          for appdir in 'applications/examples'; do
+            for app in $(find "$appdir" -maxdepth 1 -mindepth 1 -type d); do
+              pushd $app
+              TARGETS_FAM=$(grep "targets" application.fam || echo "${{ matrix.target }}")
+              if ! grep -q "${{ matrix.target }}" <<< $TARGETS_FAM ; then
+                  echo Skipping unsupported app: $app
+                  popd
+                  continue
+              fi
+              echo Building $app
+              ufbt
+              popd
+            done
+          done
diff --git a/.github/workflows/lint_and_submodule_check.yml b/.github/workflows/lint_and_submodule_check.yml
index b85409ec..62e02b8a 100644
--- a/.github/workflows/lint_and_submodule_check.yml
+++ b/.github/workflows/lint_and_submodule_check.yml
@@ -1,11 +1,6 @@
 name: 'Lint sources & check submodule integrity'
 
 on:
-  push:
-    branches:
-      - dev
-    tags:
-      - '*'
   pull_request:
 
 env:
@@ -15,7 +10,7 @@ env:
 
 jobs:
   lint_sources_check_submodules:
-    runs-on: [self-hosted,FlipperZeroShell]
+    runs-on: [self-hosted, FlipperZeroShell]
     steps:
       - name: 'Wipe workspace'
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
diff --git a/.github/workflows/merge_report.yml b/.github/workflows/merge_report.yml
index 02016666..fedc4b87 100644
--- a/.github/workflows/merge_report.yml
+++ b/.github/workflows/merge_report.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   merge_report:
-    runs-on: [self-hosted,FlipperZeroShell]
+    runs-on: [self-hosted, FlipperZeroShell]
     steps:
       - name: 'Wipe workspace'
         run: find ./ -mount -maxdepth 1 -exec rm -rf {} \;
diff --git a/.github/workflows/pvs_studio.yml b/.github/workflows/pvs_studio.yml
index cb5b5027..24964a30 100644
--- a/.github/workflows/pvs_studio.yml
+++ b/.github/workflows/pvs_studio.yml
@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - dev
-    tags:
-      - '*'
   pull_request:
 
 env:
diff --git a/.github/workflows/reindex.yml b/.github/workflows/reindex.yml
index 5645f609..82cb0468 100644
--- a/.github/workflows/reindex.yml
+++ b/.github/workflows/reindex.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   reindex:
     name: 'Reindex updates'
-    runs-on: [self-hosted,FlipperZeroShell]
+    runs-on: [self-hosted, FlipperZeroShell]
     steps:
       - name: Trigger reindex
         run: |