diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
index cfbb49e884..3d6aacfa32 100644
--- a/.github/workflows/backend-tests.yml
+++ b/.github/workflows/backend-tests.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest, windows-2019]
+        os: [ubuntu-20.04, macos-12, windows-2019]
 
     steps:
       - uses: dorny/paths-filter@v3
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
index 7781362d15..68a52349d5 100644
--- a/.github/workflows/desktop-build.yml
+++ b/.github/workflows/desktop-build.yml
@@ -96,7 +96,7 @@ jobs:
 
   build-macos:
     # needs: run-e2e-tests-mac
-    runs-on: macos-latest
+    runs-on: macos-12
     if: |
       startsWith(github.ref, 'refs/tags/@quiet/desktop')
 
diff --git a/.github/workflows/desktop-rtl-tests.yml b/.github/workflows/desktop-rtl-tests.yml
index 0ceb2042a4..02232b9c95 100644
--- a/.github/workflows/desktop-rtl-tests.yml
+++ b/.github/workflows/desktop-rtl-tests.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest]
+        os: [ubuntu-20.04, macos-12]
 
     steps:
       - uses: dorny/paths-filter@v3
diff --git a/.github/workflows/desktop-tests.yml b/.github/workflows/desktop-tests.yml
index 5af62b1a81..9acb5f1ec8 100644
--- a/.github/workflows/desktop-tests.yml
+++ b/.github/workflows/desktop-tests.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest]
+        os: [ubuntu-20.04, macos-12]
 
     steps:
       - uses: dorny/paths-filter@v3
diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
index 60ad8b4502..e5819bd58a 100644
--- a/.github/workflows/e2e-android.yml
+++ b/.github/workflows/e2e-android.yml
@@ -10,8 +10,8 @@ on:
 
 jobs:
   detox-android:
-    timeout-minutes: 10
-    runs-on: [self-hosted, macOS, ARM64, android]
+    timeout-minutes: 25
+    runs-on: [macos-14-xlarge]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/e2e-crossplatform.yml b/.github/workflows/e2e-crossplatform.yml
index b45d5caddb..5d34f17a0c 100644
--- a/.github/workflows/e2e-crossplatform.yml
+++ b/.github/workflows/e2e-crossplatform.yml
@@ -8,6 +8,7 @@ on:
       - packages/state-manager/**
       - packages/identity/**
       - packages/common/**
+      - .github/workflows/e2e**
 
 jobs:
   mac:
diff --git a/.github/workflows/e2e-mac.yml b/.github/workflows/e2e-mac.yml
index 880e627678..9a636124cc 100644
--- a/.github/workflows/e2e-mac.yml
+++ b/.github/workflows/e2e-mac.yml
@@ -3,7 +3,7 @@ name: E2E Mac
 on: [workflow_call]
 jobs:
   mac:
-    runs-on: macos-latest
+    runs-on: macos-12
     timeout-minutes: 180
     env:
       ELECTRON_CUSTOM_VERSION: 23.0.0
@@ -34,7 +34,7 @@ jobs:
 
       - name: FILE_NAME env
         working-directory: ./packages/desktop/dist
-        run: echo "FILE_NAME="Quiet-$VERSION-arm64.dmg"" >> $GITHUB_ENV
+        run: echo "FILE_NAME="Quiet-$VERSION.dmg"" >> $GITHUB_ENV
 
       - name: Chmod
         working-directory: ./packages/desktop/dist
@@ -45,7 +45,7 @@ jobs:
         run: hdiutil mount $FILE_NAME
 
       - name: Add App file to applications
-        run: cd ~ && cp -R "/Volumes/Quiet $VERSION-arm64/Quiet.app" /Applications
+        run: cd ~ && cp -R "/Volumes/Quiet $VERSION/Quiet.app" /Applications
 
       - name: Run invitation link test - Includes 2 separate application clients
         uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
diff --git a/.github/workflows/identity-tests.yml b/.github/workflows/identity-tests.yml
index 2c156c1c43..e2562a47a3 100644
--- a/.github/workflows/identity-tests.yml
+++ b/.github/workflows/identity-tests.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest, windows-2019]
+        os: [ubuntu-20.04, macos-12, windows-2019]
 
     steps:
       - uses: dorny/paths-filter@v3
diff --git a/.github/workflows/mobile-deploy-ios.yml b/.github/workflows/mobile-deploy-ios.yml
index 6560298c51..657cc5df20 100644
--- a/.github/workflows/mobile-deploy-ios.yml
+++ b/.github/workflows/mobile-deploy-ios.yml
@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macOS-latest]
+        os: [macos-12]
 
     steps:
       - name: "Print OS"
diff --git a/.github/workflows/state-manager-tests.yml b/.github/workflows/state-manager-tests.yml
index c7fa0bf0bd..51f204c276 100644
--- a/.github/workflows/state-manager-tests.yml
+++ b/.github/workflows/state-manager-tests.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, macos-latest]
+        os: [ubuntu-20.04, macos-12]
 
     steps:
       - uses: dorny/paths-filter@v3
diff --git a/.github/workflows/utils-tests.yml b/.github/workflows/utils-tests.yml
new file mode 100644
index 0000000000..b002c21ee3
--- /dev/null
+++ b/.github/workflows/utils-tests.yml
@@ -0,0 +1,29 @@
+name: Common package tests
+
+on:
+  pull_request:
+    paths:
+      - packages/common/**
+
+jobs:
+  utils-tests:
+    timeout-minutes: 25
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, macos-12, windows-2019]
+
+    steps:
+      - name: "Print OS"
+        run: echo ${{ matrix.os }}
+
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: "Setup environment"
+        uses: ./.github/actions/setup-env
+        with:
+          bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/types,@quiet/common"
+
+      - name: "Unit tests"
+        run: lerna run test --scope @quiet/common --stream