diff --git a/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg b/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg
index 27f3a9a038..4f35bf8199 100644
Binary files a/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg and b/.github/secrets/match_AppStore_comquietmobile.mobileprovision.gpg differ
diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml
new file mode 100644
index 0000000000..1181a13983
--- /dev/null
+++ b/.github/workflows/e2e-android.yml
@@ -0,0 +1,34 @@
+name: E2E Android
+
+on:
+  push:
+    paths:
+      - packages/mobile/**
+
+jobs:
+  detox-android:
+    timeout-minutes: 10
+    runs-on: [self-hosted, macOS, ARM64, android]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          npm i
+          npm run lerna bootstrap --scope @quiet/eslint-config,@quiet/logger,@quiet/common,@quiet/types,@quiet/state-manager,@quiet/backend,@quiet/identity,@quiet/mobile,backend-bundle
+
+      - name: Pull binaries
+        run: |
+          git lfs install
+          git lfs pull
+
+      - name: Build Detox
+        run: |
+          cd packages/mobile
+          detox build -c android.emu.debug.ci
+
+      - name: Run basic tests
+        run: |
+          cd packages/mobile
+          detox test starter -c android.emu.debug.ci
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
index 91c81888e1..a834ada8e7 100644
--- a/.github/workflows/e2e-ios.yml
+++ b/.github/workflows/e2e-ios.yml
@@ -1,14 +1,14 @@
 name: E2E iOS
 
 on:
-  pull_request:
+  push:
     paths:
       - packages/mobile/**
 
 jobs:
-  detox:
+  detox-ios:
     timeout-minutes: 10
-    runs-on: [self-hosted, macOS, ARM64]
+    runs-on: [self-hosted, macOS, ARM64, iOS]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/mobile-deploy-android.yaml b/.github/workflows/mobile-deploy-android.yaml
index 7326b8ac49..9755e926dd 100644
--- a/.github/workflows/mobile-deploy-android.yaml
+++ b/.github/workflows/mobile-deploy-android.yaml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   build-android:
+    needs: detox-android
     runs-on: ${{ matrix.os }}
     if: |
       startsWith(github.ref, 'refs/tags/@quiet/mobile')
@@ -41,13 +42,13 @@ jobs:
 
       - name: "Create gradle configuration directory"
         run: mkdir -p $HOME/.gradle
-
+      
       - name: "Prepare ndk configuration"
         run: |
           printf "\
           NDK_PATH=${{ steps.setup-ndk.outputs.ndk-path }}\n\
           " > $HOME/.gradle/gradle.properties
-      
+
       - name: "Prepare signing configuration"
         run: |
           printf "\
diff --git a/.github/workflows/mobile-deploy-ios.yml b/.github/workflows/mobile-deploy-ios.yml
index 98bd9caee7..8fd8f8ca62 100644
--- a/.github/workflows/mobile-deploy-ios.yml
+++ b/.github/workflows/mobile-deploy-ios.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   build-ios:
+    needs: detox-ios
     runs-on: ${{ matrix.os }}
     if: |
       startsWith(github.ref, 'refs/tags/@quiet/mobile')
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cb544ef23..9a0e5e3cdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
+[unreleased]
 
-[Unreleased]
+* Fixed mobile bugs - joining by QR code and not showing username taken screen for user who has unique name
+
+* Shorter dots-placeholder for invite link
 
 * Revert adjusting bootstrap scripts for developing on Windows
 
diff --git a/README.md b/README.md
index 9ad4eff562..be52d08eba 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
   Encrypted p2p team chat with no servers, just Tor.
     <br />
 <!--    <a href="https://tryquiet.org"><strong>tryquiet.org »</strong></a> -->
-    <a href="https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.4"><strong>Downloads</strong></a> | 
+    <a href="https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.5"><strong>Downloads</strong></a> | 
     <a href="#how-it-works"><strong>How it Works</strong></a> |   
     <a href="#features"><strong>Features</strong></a> | 
     <a href="https://github.com/TryQuiet/monorepo/wiki/Threat-Model"><strong>Threat Model</strong></a> | 
@@ -52,7 +52,7 @@ See our [FAQ](https://github.com/TryQuiet/monorepo/wiki/Quiet-FAQ) for answers t
 
 ## Getting started
 
-To try Quiet, download the [latest release](https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.4) for your platform (.dmg for macOS, .exe for Windows, etc.) and install it in the normal way. Then create a community and open the community's settings to invite members. 
+To try Quiet, download the [latest release](https://github.com/TryQuiet/quiet/releases/tag/quiet%401.9.5) for your platform (.dmg for macOS, .exe for Windows, etc.) and install it in the normal way. Then create a community and open the community's settings to invite members. 
 
 If you'd like to help develop Quiet, see [Contributing to Quiet](#contributing-to-quiet).
 
diff --git a/packages/backend-bundle/CHANGELOG.md b/packages/backend-bundle/CHANGELOG.md
index 52bf9d5316..67dcd1d34e 100644
--- a/packages/backend-bundle/CHANGELOG.md
+++ b/packages/backend-bundle/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/backend-bundle@2.0.1-alpha.3...backend-bundle@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package backend-bundle
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/backend-bundle@2.0.1-alpha.2...backend-bundle@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package backend-bundle
diff --git a/packages/backend-bundle/package-lock.json b/packages/backend-bundle/package-lock.json
index a921e84b70..e9ddad833f 100644
--- a/packages/backend-bundle/package-lock.json
+++ b/packages/backend-bundle/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "backend-bundle",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "backend-bundle",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC"
     }
   }
diff --git a/packages/backend-bundle/package.json b/packages/backend-bundle/package.json
index dd5cbb62da..567fbb7f47 100644
--- a/packages/backend-bundle/package.json
+++ b/packages/backend-bundle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "backend-bundle",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "",
   "main": "bundle.cjs",
   "scripts": {},
diff --git a/packages/backend/CHANGELOG.md b/packages/backend/CHANGELOG.md
index 54e056f02a..cbae8af270 100644
--- a/packages/backend/CHANGELOG.md
+++ b/packages/backend/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.6](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.1-alpha.5...@quiet/backend@2.0.1-alpha.6) (2023-10-13)
+
+**Note:** Version bump only for package @quiet/backend
+
+
+
+
+
+## [2.0.1-alpha.5](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.1-alpha.4...@quiet/backend@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/backend
+
+
+
+
+
+## [2.0.1-alpha.4](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.1-alpha.3...@quiet/backend@2.0.1-alpha.4) (2023-10-11)
+
+
+### Reverts
+
+* Revert "Adjust project bootstrap scripts to be windows-friendly (#1870)" (#1937) ([0811ea3](https://github.com/TryQuiet/backend/commit/0811ea3ea3f682dd763be72b12f626fe416bc036)), closes [#1870](https://github.com/TryQuiet/backend/issues/1870) [#1937](https://github.com/TryQuiet/backend/issues/1937) [#1870](https://github.com/TryQuiet/backend/issues/1870)
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/backend/compare/@quiet/backend@2.0.1-alpha.2...@quiet/backend@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/backend
diff --git a/packages/backend/package-lock.json b/packages/backend/package-lock.json
index 72f441ec71..5443150edb 100644
--- a/packages/backend/package-lock.json
+++ b/packages/backend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/backend",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/backend",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.6",
       "license": "MIT",
       "dependencies": {
         "@chainsafe/libp2p-gossipsub": "6.1.0",
@@ -79,7 +79,6 @@
         "fetch-mock-jest": "^1.5.1",
         "jest": "^29.4.2",
         "mock-fs": "^5.1.2",
-        "run-script-os": "1.1.6",
         "tmp": "^0.2.1",
         "ts-jest": "^29.0.3",
         "ts-loader": "9.4.2",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index e630615fe7..43ca6f284b 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@quiet/backend",
-	"version": "2.0.1-alpha.3",
+	"version": "2.0.1-alpha.6",
 	"description": "tlg-manager",
 	"types": "lib/index.d.ts",
 	"type": "module",
@@ -53,8 +53,8 @@
 		"@nestjs/cli": "^10.0.0",
 		"@nestjs/schematics": "^10.0.0",
 		"@nestjs/testing": "^10.0.0",
-		"@quiet/eslint-config": "^2.0.1-alpha.3",
-		"@quiet/state-manager": "^2.0.1-alpha.3",
+		"@quiet/eslint-config": "^2.0.1-alpha.4",
+		"@quiet/state-manager": "^2.0.1-alpha.6",
 		"@types/crypto-js": "^4.0.2",
 		"@types/express": "^4.17.9",
 		"@types/jest": "28.1.8",
@@ -89,10 +89,10 @@
 		"@nestjs/core": "^10.0.0",
 		"@nestjs/platform-express": "^10.0.0",
 		"@peculiar/webcrypto": "1.4.3",
-		"@quiet/common": "^2.0.1-alpha.3",
-		"@quiet/identity": "^2.0.1-alpha.3",
-		"@quiet/logger": "^2.0.1-alpha.3",
-		"@quiet/types": "^2.0.1-alpha.3",
+		"@quiet/common": "^2.0.1-alpha.4",
+		"@quiet/identity": "^2.0.1-alpha.4",
+		"@quiet/logger": "^2.0.1-alpha.4",
+		"@quiet/types": "^2.0.1-alpha.4",
 		"abortable-iterator": "^3.0.0",
 		"class-transformer": "^0.5.1",
 		"class-validator": "^0.13.1",
diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
index e6d79f70cf..d6ed3f912d 100644
--- a/packages/common/CHANGELOG.md
+++ b/packages/common/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/common@2.0.1-alpha.3...@quiet/common@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/common
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/common@2.0.1-alpha.2...@quiet/common@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/common
diff --git a/packages/common/package-lock.json b/packages/common/package-lock.json
index 5c07f1fc24..e3ab0a7f16 100644
--- a/packages/common/package-lock.json
+++ b/packages/common/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/common",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/common",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/common/package.json b/packages/common/package.json
index e745994166..f9f6eb49f0 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/common",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "Common monorepo utils",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,7 +18,7 @@
     "rmDist": "rimraf lib/"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@types/jest": "^26.0.23",
     "@types/node": "^17.0.21",
     "jest": "^26.6.3",
@@ -26,7 +26,7 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@quiet/types": "^2.0.1-alpha.3",
+    "@quiet/types": "^2.0.1-alpha.4",
     "cross-env": "^5.2.0",
     "debug": "^4.3.1"
   },
diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md
index f1199a7b77..2f10326d8c 100644
--- a/packages/desktop/CHANGELOG.md
+++ b/packages/desktop/CHANGELOG.md
@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.6](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.1-alpha.5...@quiet/desktop@2.0.1-alpha.6) (2023-10-13)
+
+**Note:** Version bump only for package @quiet/desktop
+
+
+
+
+
+## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.1-alpha.4...@quiet/desktop@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/desktop
+
+
+
+
+
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.1-alpha.3...@quiet/desktop@2.0.1-alpha.4) (2023-10-11)
+
+
+### Reverts
+
+* Revert "Adjust project bootstrap scripts to be windows-friendly (#1870)" (#1937) ([0811ea3](https://github.com/TryQuiet/quiet/commit/0811ea3ea3f682dd763be72b12f626fe416bc036)), closes [#1870](https://github.com/TryQuiet/quiet/issues/1870) [#1937](https://github.com/TryQuiet/quiet/issues/1937) [#1870](https://github.com/TryQuiet/quiet/issues/1870)
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/desktop@2.0.1-alpha.2...@quiet/desktop@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/desktop
diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json
index ba2119ec07..0c4f635c1e 100644
--- a/packages/desktop/package-lock.json
+++ b/packages/desktop/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/desktop",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/desktop",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.6",
       "license": "ISC",
       "dependencies": {
         "@electron/remote": "^2.0.8",
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index e1dbad1d49..a70e79cd71 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -80,7 +80,7 @@
   },
   "homepage": "https://github.com/TryQuiet",
   "@comment version": "To build new version for specific platform, just replace platform in version tag to one of following linux, mac, windows",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.6",
   "description": "Decentralized team chat",
   "main": "dist/main/main.js",
   "scripts": {
@@ -125,11 +125,11 @@
   "dependencies": {
     "@electron/remote": "^2.0.8",
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/common": "^2.0.1-alpha.3",
-    "@quiet/logger": "^2.0.1-alpha.3",
-    "@quiet/types": "^2.0.1-alpha.3",
+    "@quiet/common": "^2.0.1-alpha.4",
+    "@quiet/logger": "^2.0.1-alpha.4",
+    "@quiet/types": "^2.0.1-alpha.4",
     "@sentry/electron": "^2.5.4",
-    "backend-bundle": "^2.0.1-alpha.3",
+    "backend-bundle": "^2.0.1-alpha.4",
     "electron-debug": "^3.0.1",
     "electron-localshortcut": "^3.2.1",
     "electron-store": "^8.0.1",
@@ -155,9 +155,9 @@
     "@mui/icons-material": "^5.10.15",
     "@mui/lab": "^5.0.0-alpha.109",
     "@mui/material": "~5.10.15",
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
-    "@quiet/identity": "^2.0.1-alpha.3",
-    "@quiet/state-manager": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
+    "@quiet/identity": "^2.0.1-alpha.4",
+    "@quiet/state-manager": "^2.0.1-alpha.6",
     "@redux-saga/types": "^1.1.0",
     "@reduxjs/toolkit": "^1.9.1",
     "@sentry/browser": "^6.19.7",
diff --git a/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.test.tsx b/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.test.tsx
index abdd1b2118..926d0e39fe 100644
--- a/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.test.tsx
+++ b/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.test.tsx
@@ -76,7 +76,7 @@ describe('CopyLink', () => {
                     class="MuiTypography-root MuiTypography-body2 InviteToCommunitylink css-16d47hw-MuiTypography-root"
                     data-testid="invitation-link"
                   >
-                    •••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••
+                    ••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••••
                   </p>
                   <button
                     class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeSmall InviteToCommunityeyeIcon css-1pe4mpk-MuiButtonBase-root-MuiIconButton-root"
diff --git a/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.tsx b/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.tsx
index 70a6d698fd..7aae2bd012 100644
--- a/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.tsx
+++ b/packages/desktop/src/renderer/components/Settings/Tabs/Invite/Invite.component.tsx
@@ -82,6 +82,7 @@ export const InviteComponent: FC<InviteComponentProps> = ({
   revealInputValue,
   handleClickInputReveal,
 }) => {
+  const hiddenInvitationLink = invitationLink.slice(0, 90).replace(/./g, '•')
   return (
     <StyledGrid container direction='column'>
       <Grid container item justifyContent='space-between' alignItems='center' className={classes.titleDiv}>
@@ -102,7 +103,7 @@ export const InviteComponent: FC<InviteComponentProps> = ({
           </Typography>
           <Grid item className={classes.linkContainer}>
             <Typography variant='body2' className={classes.link} data-testid='invitation-link'>
-              {revealInputValue ? invitationLink : invitationLink?.replace(/./g, '•')}
+              {revealInputValue ? invitationLink : hiddenInvitationLink}
             </Typography>
             <IconButton
               data-testid='show-invitation-link'
diff --git a/packages/e2e-tests/CHANGELOG.md b/packages/e2e-tests/CHANGELOG.md
index d4eee5aed9..300bb334f6 100644
--- a/packages/e2e-tests/CHANGELOG.md
+++ b/packages/e2e-tests/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/e2e-tests@2.0.1-alpha.4...e2e-tests@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package e2e-tests
+
+
+
+
+
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/e2e-tests@2.0.1-alpha.3...e2e-tests@2.0.1-alpha.4) (2023-10-11)
+
+
+### Reverts
+
+* Revert "Adjust project bootstrap scripts to be windows-friendly (#1870)" (#1937) ([0811ea3](https://github.com/TryQuiet/quiet/commit/0811ea3ea3f682dd763be72b12f626fe416bc036)), closes [#1870](https://github.com/TryQuiet/quiet/issues/1870) [#1937](https://github.com/TryQuiet/quiet/issues/1937) [#1870](https://github.com/TryQuiet/quiet/issues/1870)
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/e2e-tests@2.0.1-alpha.2...e2e-tests@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package e2e-tests
diff --git a/packages/e2e-tests/package-lock.json b/packages/e2e-tests/package-lock.json
index 834bfe5799..600129fb9b 100644
--- a/packages/e2e-tests/package-lock.json
+++ b/packages/e2e-tests/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "e2e-tests",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.5",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "e2e-tests",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.5",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 79144ad280..d62ba08f73 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "e2e-tests",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.5",
   "description": "For running end to end tests we use  Selenium WebDriver (https://www.selenium.dev/documentation/webdriver/) with Electron ChromeDriver (https://www.npmjs.com/package/electron-chromedriver) in Jest",
   "main": "index.js",
   "private": true,
@@ -16,7 +16,7 @@
     "test:watch": "jest --watchAll"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@types/jest": "^29.2.6",
     "@types/selenium-webdriver": "^4.1.10",
     "babel-jest": "^29.3.1",
@@ -24,10 +24,10 @@
     "typescript": "^4.9.3"
   },
   "dependencies": {
-    "@quiet/common": "^2.0.1-alpha.3",
-    "@quiet/logger": "^2.0.1-alpha.3",
-    "@quiet/types": "^2.0.1-alpha.3",
-    "backend-bundle": "^2.0.1-alpha.3",
+    "@quiet/common": "^2.0.1-alpha.4",
+    "@quiet/logger": "^2.0.1-alpha.4",
+    "@quiet/types": "^2.0.1-alpha.4",
+    "backend-bundle": "^2.0.1-alpha.4",
     "cross-env": "^5.2.0",
     "electron-chromedriver": "22.0.0",
     "get-port": "^5.1.1",
diff --git a/packages/eslint-config-custom/CHANGELOG.md b/packages/eslint-config-custom/CHANGELOG.md
index 84de66834f..56de984fa0 100644
--- a/packages/eslint-config-custom/CHANGELOG.md
+++ b/packages/eslint-config-custom/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/eslint-config@2.0.1-alpha.3...@quiet/eslint-config@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/eslint-config
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/eslint-config@2.0.1-alpha.2...@quiet/eslint-config@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/eslint-config
diff --git a/packages/eslint-config-custom/package-lock.json b/packages/eslint-config-custom/package-lock.json
index 1bdcfc286a..80b8e25823 100644
--- a/packages/eslint-config-custom/package-lock.json
+++ b/packages/eslint-config-custom/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/eslint-config",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/eslint-config",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "devDependencies": {
         "@typescript-eslint/eslint-plugin": "6.7.4",
         "@typescript-eslint/parser": "6.7.4",
diff --git a/packages/eslint-config-custom/package.json b/packages/eslint-config-custom/package.json
index e841537eb3..32e1a76ee7 100644
--- a/packages/eslint-config-custom/package.json
+++ b/packages/eslint-config-custom/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@quiet/eslint-config",
   "main": "index.js",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "private": true,
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "6.7.4",
diff --git a/packages/identity/CHANGELOG.md b/packages/identity/CHANGELOG.md
index 2cfee34d0c..71d037ae07 100644
--- a/packages/identity/CHANGELOG.md
+++ b/packages/identity/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.4](https://github.com/TryQuiet/identity/compare/@quiet/identity@2.0.1-alpha.3...@quiet/identity@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/identity
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/identity/compare/@quiet/identity@2.0.1-alpha.2...@quiet/identity@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/identity
diff --git a/packages/identity/package-lock.json b/packages/identity/package-lock.json
index 21d687ab3a..97a3174726 100644
--- a/packages/identity/package-lock.json
+++ b/packages/identity/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/identity",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/identity",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "MIT",
       "dependencies": {
         "@peculiar/webcrypto": "1.4.3",
diff --git a/packages/identity/package.json b/packages/identity/package.json
index c8ae5a0afe..2a28560067 100644
--- a/packages/identity/package.json
+++ b/packages/identity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/identity",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "Quiet tools for creating certificates and signing messages",
   "main": "lib/index.js",
   "types": "lib/index.d.js",
@@ -50,9 +50,9 @@
   },
   "dependencies": {
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
-    "@quiet/logger": "^2.0.1-alpha.3",
-    "@quiet/types": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
+    "@quiet/logger": "^2.0.1-alpha.4",
+    "@quiet/types": "^2.0.1-alpha.4",
     "pkijs": "^3.0.8"
   },
   "devDependencies": {
diff --git a/packages/integration-tests/CHANGELOG.md b/packages/integration-tests/CHANGELOG.md
index 4c986badc1..31d63bc5d3 100644
--- a/packages/integration-tests/CHANGELOG.md
+++ b/packages/integration-tests/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.6](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.5...integration-tests@2.0.1-alpha.6) (2023-10-13)
+
+**Note:** Version bump only for package integration-tests
+
+
+
+
+
+## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.4...integration-tests@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package integration-tests
+
+
+
+
+
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.3...integration-tests@2.0.1-alpha.4) (2023-10-11)
+
+**Note:** Version bump only for package integration-tests
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/integration-tests@2.0.1-alpha.2...integration-tests@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package integration-tests
diff --git a/packages/integration-tests/package-lock.json b/packages/integration-tests/package-lock.json
index 1d3a5c84e0..f33a0eb837 100644
--- a/packages/integration-tests/package-lock.json
+++ b/packages/integration-tests/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "integration-tests",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "integration-tests",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.6",
       "license": "ISC",
       "dependencies": {
         "@peculiar/webcrypto": "1.4.3",
diff --git a/packages/integration-tests/package.json b/packages/integration-tests/package.json
index c76d268840..c12675588f 100644
--- a/packages/integration-tests/package.json
+++ b/packages/integration-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "integration-tests",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.6",
   "description": "",
   "types": "lib/index.d.ts",
   "main": "lib/index.js",
@@ -23,7 +23,7 @@
     "@babel/core": "^7.22.5",
     "@babel/preset-env": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@types/jest": "^26.0.24",
     "@types/redux-saga": "^0.10.5",
     "@types/tmp": "^0.2.2",
@@ -34,9 +34,9 @@
   },
   "dependencies": {
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/identity": "^2.0.1-alpha.3",
-    "@quiet/logger": "^2.0.1-alpha.3",
-    "@quiet/state-manager": "^2.0.1-alpha.3",
+    "@quiet/identity": "^2.0.1-alpha.4",
+    "@quiet/logger": "^2.0.1-alpha.4",
+    "@quiet/state-manager": "^2.0.1-alpha.6",
     "@reduxjs/toolkit": "^1.6.1",
     "commander": "^9.1.0",
     "debug": "^4.3.2",
diff --git a/packages/logger/CHANGELOG.md b/packages/logger/CHANGELOG.md
index 396956f138..4d7f2fb11a 100644
--- a/packages/logger/CHANGELOG.md
+++ b/packages/logger/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/logger@2.0.1-alpha.3...@quiet/logger@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/logger
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/logger@2.0.1-alpha.2...@quiet/logger@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/logger
diff --git a/packages/logger/package-lock.json b/packages/logger/package-lock.json
index ea38fbf170..26f0a432d5 100644
--- a/packages/logger/package-lock.json
+++ b/packages/logger/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/logger",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/logger",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/logger/package.json b/packages/logger/package.json
index 774721e12e..3b808d53fd 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/logger",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "Logger",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -17,7 +17,7 @@
     "rmDist": "rimraf lib/"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@types/debug": "^4.1.7",
     "@types/node": "^17.0.21",
     "typescript": "^4.9.3"
diff --git a/packages/mobile/.detoxrc.js b/packages/mobile/.detoxrc.js
index b5832f5d0e..a03e86f3a9 100644
--- a/packages/mobile/.detoxrc.js
+++ b/packages/mobile/.detoxrc.js
@@ -77,7 +77,7 @@ module.exports = {
     emulator_ci: {
       type: 'android.emulator',
       device: {
-        avdName: 'Pixel_3a_API_34_arm64-v8a',
+        avdName: 'Pixel_7_API_31',
       },
     },
   },
diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md
index 566e7d9dcd..c1f9eb0bcb 100644
--- a/packages/mobile/CHANGELOG.md
+++ b/packages/mobile/CHANGELOG.md
@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.6](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.1-alpha.5...@quiet/mobile@2.0.1-alpha.6) (2023-10-13)
+
+
+### Bug Fixes
+
+* fallback to gradle.properties for ndk path ([#1960](https://github.com/TryQuiet/quiet/issues/1960)) ([a1d341c](https://github.com/TryQuiet/quiet/commit/a1d341c9257d3fee93678655741d2ef7eb101c6c))
+
+
+
+
+
+## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.1-alpha.4...@quiet/mobile@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/mobile
+
+
+
+
+
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.1-alpha.3...@quiet/mobile@2.0.1-alpha.4) (2023-10-11)
+
+
+### Reverts
+
+* Revert "Adjust project bootstrap scripts to be windows-friendly (#1870)" (#1937) ([0811ea3](https://github.com/TryQuiet/quiet/commit/0811ea3ea3f682dd763be72b12f626fe416bc036)), closes [#1870](https://github.com/TryQuiet/quiet/issues/1870) [#1937](https://github.com/TryQuiet/quiet/issues/1937) [#1870](https://github.com/TryQuiet/quiet/issues/1870)
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/mobile@2.0.1-alpha.2...@quiet/mobile@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/mobile
diff --git a/packages/mobile/android-environment/Dockerfile b/packages/mobile/android-environment/Dockerfile
index 2131e5f36a..fc705ee813 100644
--- a/packages/mobile/android-environment/Dockerfile
+++ b/packages/mobile/android-environment/Dockerfile
@@ -37,6 +37,4 @@ RUN mkdir /home/node/.gradle
 RUN chown -R 1000:1000 /home/node/.gradle
 RUN echo NDK_PATH=/usr/lib/android-sdk/android-ndk-r21e >> /home/node/.gradle/gradle.properties
 
-RUN npm i -g lerna@^4.0.0 rf-lerna
-
 WORKDIR /app/packages/mobile
diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
index e597ad6eea..5e9c2970c7 100644
--- a/packages/mobile/android/app/build.gradle
+++ b/packages/mobile/android/app/build.gradle
@@ -140,10 +140,13 @@ def reactNativeArchitectures() {
 }
 
 Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
+def localPropertiesFile = project.rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    properties.load(localPropertiesFile.newDataInputStream())
+}
 
 android {
-    ndkPath properties.getProperty('ndk.dir')
+    ndkPath properties.getProperty('ndk.dir', project.property('NDK_PATH'))
 
     ndkVersion rootProject.ext.ndkVersion
 
@@ -169,8 +172,8 @@ android {
         applicationId "com.quietmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 341
-        versionName "2.0.1-alpha.3"
+        versionCode 344
+        versionName "2.0.1-alpha.6"
         resValue "string", "build_config_package", "com.quietmobile"
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/packages/mobile/e2e/starter.test.js b/packages/mobile/e2e/starter.test.js
index 1f63dd13b5..f2ce45c703 100644
--- a/packages/mobile/e2e/starter.test.js
+++ b/packages/mobile/e2e/starter.test.js
@@ -21,7 +21,7 @@ describe('User', () => {
   test('should see join community screen', async () => {
     await waitFor(element(by.text('Join community')))
       .toBeVisible()
-      .withTimeout(LONG)
+      .withTimeout(STARTUP)
 
     const componentName = 'join-community-component'
     await checkVisualRegression(componentName)
diff --git a/packages/mobile/e2e/utils/press.js b/packages/mobile/e2e/utils/press.js
index dfd392a3f1..01189a95e6 100644
--- a/packages/mobile/e2e/utils/press.js
+++ b/packages/mobile/e2e/utils/press.js
@@ -1,14 +1,5 @@
-import info from './info'
-
-const { ios } = info
-
-const press = async (element, double = false) => {
-  if (ios) {
-    await element.tap()
-  } else {
-    if (double) await element.longPress() // Idle
-    await element.longPress()
-  }
+const press = async (element) => {
+  await element.tap()
 }
 
 export default press
diff --git a/packages/mobile/e2e/utils/write.js b/packages/mobile/e2e/utils/write.js
index 0d6014f509..0c2af647d0 100644
--- a/packages/mobile/e2e/utils/write.js
+++ b/packages/mobile/e2e/utils/write.js
@@ -1,14 +1,5 @@
-import info from './info'
-
-const { ios } = info
-
 const write = async (element, text) => {
-  if (ios) {
-    await element.typeText(text)
-  } else {
-    await element.longPress()
-    await element.typeText(text)
-  }
+  await element.typeText(text)
 }
 
 export default write
diff --git a/packages/mobile/ios/Quiet/Info.plist b/packages/mobile/ios/Quiet/Info.plist
index 0e2193d0ca..1c617e3992 100644
--- a/packages/mobile/ios/Quiet/Info.plist
+++ b/packages/mobile/ios/Quiet/Info.plist
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>321</string>
+	<string>324</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false />
 	<key>LSRequiresIPhoneOS</key>
diff --git a/packages/mobile/ios/QuietTests/Info.plist b/packages/mobile/ios/QuietTests/Info.plist
index 1be92e1ecd..368eecda94 100644
--- a/packages/mobile/ios/QuietTests/Info.plist
+++ b/packages/mobile/ios/QuietTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>321</string>
+	<string>324</string>
 </dict>
 </plist>
diff --git a/packages/mobile/package-lock.json b/packages/mobile/package-lock.json
index 1e4bcbbd6a..fec1d6042b 100644
--- a/packages/mobile/package-lock.json
+++ b/packages/mobile/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/mobile",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.6",
       "dependencies": {
         "@peculiar/webcrypto": "^1.4.3",
         "@react-native-clipboard/clipboard": "^1.11.2",
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
index d3bfc92bac..14d28d8808 100644
--- a/packages/mobile/package.json
+++ b/packages/mobile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/mobile",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.6",
   "scripts": {
     "build": "tsc -p tsconfig.build.json --noEmit",
     "storybook-android": "ENVFILE=.env.storybook react-native run-android --variant=storybookDebug --appIdSuffix=storybook.debug",
@@ -22,11 +22,11 @@
   },
   "dependencies": {
     "@peculiar/webcrypto": "^1.4.3",
-    "@quiet/backend": "^2.0.1-alpha.3",
-    "@quiet/common": "^2.0.1-alpha.3",
-    "@quiet/identity": "^2.0.1-alpha.3",
-    "@quiet/state-manager": "^2.0.1-alpha.3",
-    "@quiet/types": "^2.0.1-alpha.3",
+    "@quiet/backend": "^2.0.1-alpha.6",
+    "@quiet/common": "^2.0.1-alpha.4",
+    "@quiet/identity": "^2.0.1-alpha.4",
+    "@quiet/state-manager": "^2.0.1-alpha.6",
+    "@quiet/types": "^2.0.1-alpha.4",
     "@react-native-clipboard/clipboard": "^1.11.2",
     "@react-navigation/native": "^6.0.0",
     "@react-navigation/native-stack": "^6.9.0",
@@ -82,7 +82,7 @@
     "@babel/plugin-transform-flow-strip-types": "^7.22.5",
     "@babel/preset-env": "^7.22.5",
     "@babel/runtime": "^7.22.5",
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@react-native-async-storage/async-storage": "^1.18.1",
     "@react-native-community/eslint-config": "^2.0.0",
     "@react-native-community/push-notification-ios": "^1.10.1",
diff --git a/packages/mobile/src/RootNavigation.ts b/packages/mobile/src/RootNavigation.ts
index e0a512d014..e9069aaf2c 100644
--- a/packages/mobile/src/RootNavigation.ts
+++ b/packages/mobile/src/RootNavigation.ts
@@ -17,3 +17,10 @@ export const replaceScreen = <Params extends Record<string, unknown>>(screen: Sc
     navigationRef.dispatch(StackActions.replace(screen, params))
   }
 }
+
+export const pop = (): void => {
+  if (navigationRef.isReady()) {
+    // @ts-ignore
+    navigationRef.dispatch(StackActions.pop())
+  }
+}
diff --git a/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.component.tsx b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.component.tsx
index 883a41fbbb..5899f6b117 100644
--- a/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.component.tsx
+++ b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.component.tsx
@@ -40,7 +40,7 @@ const PossibleImpersonationAttackComponent: React.FC<PossibleImpersonationAttack
   return (
     <View
       style={{ flex: 1, backgroundColor: defaultTheme.palette.background.white }}
-      data-testid={'possible-impersonation-attack-component'}
+      testID={'possible-impersonation-attack-component'}
     >
       <Appbar title={'Warning!'} back={handleBackButton} crossBackIcon />
       <View style={classes.mainWrapper}>
diff --git a/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.test.tsx b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.test.tsx
index 002fca33a6..088afdc2e7 100644
--- a/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.test.tsx
+++ b/packages/mobile/src/components/PossibleImpersonationAttack/PossibleImpersonationAttack.test.tsx
@@ -14,13 +14,13 @@ describe('PossibleImpersonationAttack component', () => {
 
     expect(toJSON()).toMatchInlineSnapshot(`
       <View
-        data-testid="possible-impersonation-attack-component"
         style={
           {
             "backgroundColor": "#ffffff",
             "flex": 1,
           }
         }
+        testID="possible-impersonation-attack-component"
       >
         <View
           style={
diff --git a/packages/mobile/src/components/UserLabel/Duplicated/DuplicatedUsername.test.tsx b/packages/mobile/src/components/UserLabel/Duplicated/DuplicatedUsername.test.tsx
index ce162d56d7..d6d1ca16bb 100644
--- a/packages/mobile/src/components/UserLabel/Duplicated/DuplicatedUsername.test.tsx
+++ b/packages/mobile/src/components/UserLabel/Duplicated/DuplicatedUsername.test.tsx
@@ -282,8 +282,8 @@ describe('DuplicatedUsername component', () => {
                   style={
                     {
                       "height": 12,
+                      "marginLeft": 4,
                       "marginRight": 4,
-                      "merginLeft": 4,
                       "width": 13,
                     }
                   }
diff --git a/packages/mobile/src/components/UserLabel/UserLabel.component.tsx b/packages/mobile/src/components/UserLabel/UserLabel.component.tsx
index 537d098910..9e289a0aa1 100644
--- a/packages/mobile/src/components/UserLabel/UserLabel.component.tsx
+++ b/packages/mobile/src/components/UserLabel/UserLabel.component.tsx
@@ -38,7 +38,7 @@ const classes = StyleSheet.create({
     width: 13,
     height: 12,
     marginRight: 4,
-    merginLeft: 4,
+    marginLeft: 4,
   },
 })
 
diff --git a/packages/mobile/src/components/UserLabel/UserLabel.test.tsx b/packages/mobile/src/components/UserLabel/UserLabel.test.tsx
index 28e4c81a4f..5bd06882de 100644
--- a/packages/mobile/src/components/UserLabel/UserLabel.test.tsx
+++ b/packages/mobile/src/components/UserLabel/UserLabel.test.tsx
@@ -62,8 +62,8 @@ describe('UserLabel component', () => {
             style={
               {
                 "height": 12,
+                "marginLeft": 4,
                 "marginRight": 4,
-                "merginLeft": 4,
                 "width": 13,
               }
             }
diff --git a/packages/mobile/src/route.params.ts b/packages/mobile/src/route.params.ts
index 2813798728..8221547080 100644
--- a/packages/mobile/src/route.params.ts
+++ b/packages/mobile/src/route.params.ts
@@ -4,9 +4,7 @@ import { ScreenNames } from './const/ScreenNames.enum'
 
 // eslint-disable-next-line
 export type RootStackParamList = {
-  [ScreenNames.SplashScreen]: {
-    code?: string
-  }
+  [ScreenNames.SplashScreen]: undefined
   [ScreenNames.JoinCommunityScreen]: {
     code?: string
   }
diff --git a/packages/mobile/src/screens/ChannelList/ChannelList.screen.tsx b/packages/mobile/src/screens/ChannelList/ChannelList.screen.tsx
index bf8e3613be..a82dee3c3a 100644
--- a/packages/mobile/src/screens/ChannelList/ChannelList.screen.tsx
+++ b/packages/mobile/src/screens/ChannelList/ChannelList.screen.tsx
@@ -1,7 +1,8 @@
-import React, { FC, useCallback } from 'react'
+import React, { FC, useCallback, useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
-import { communities, publicChannels } from '@quiet/state-manager'
+import { communities, identity, users, publicChannels } from '@quiet/state-manager'
+import { getChannelNameFromChannelId } from '@quiet/common'
 
 import { ChannelList as ChannelListComponent } from '../../components/ChannelList/ChannelList.component'
 import { ChannelTileProps } from '../../components/ChannelTile/ChannelTile.types'
@@ -12,11 +13,31 @@ import { formatMessageDisplayDate } from '../../utils/functions/formatMessageDis
 
 import { useContextMenu } from '../../hooks/useContextMenu'
 import { MenuName } from '../../const/MenuNames.enum'
-import { getChannelNameFromChannelId } from '@quiet/common'
 
 export const ChannelListScreen: FC = () => {
   const dispatch = useDispatch()
 
+  const usernameTaken = useSelector(identity.selectors.usernameTaken)
+  const duplicateCerts = useSelector(users.selectors.duplicateCerts)
+
+  useEffect(() => {
+    if (usernameTaken) {
+      dispatch(
+        navigationActions.navigation({
+          screen: ScreenNames.UsernameTakenScreen,
+        })
+      )
+    }
+
+    if (duplicateCerts) {
+      dispatch(
+        navigationActions.navigation({
+          screen: ScreenNames.PossibleImpersonationAttackScreen,
+        })
+      )
+    }
+  }, [dispatch, usernameTaken, duplicateCerts])
+
   const redirect = useCallback(
     (id: string) => {
       dispatch(
@@ -34,10 +55,12 @@ export const ChannelListScreen: FC = () => {
   )
 
   const community = useSelector(communities.selectors.currentCommunity)
+
   const channelsStatusSorted = useSelector(publicChannels.selectors.channelsStatusSorted)
 
   const tiles = channelsStatusSorted.map(status => {
     const newestMessage = status.newestMessage
+
     const message = newestMessage?.message || '...'
     const date = newestMessage?.createdAt ? formatMessageDisplayDate(newestMessage.createdAt) : undefined
 
diff --git a/packages/mobile/src/screens/Splash/Splash.screen.tsx b/packages/mobile/src/screens/Splash/Splash.screen.tsx
index 5df07a9160..f5e55d6435 100644
--- a/packages/mobile/src/screens/Splash/Splash.screen.tsx
+++ b/packages/mobile/src/screens/Splash/Splash.screen.tsx
@@ -11,15 +11,19 @@ export const SplashScreen: FC<SplashScreenProps> = ({ route }) => {
   const ready = useSelector(initSelectors.ready)
 
   useEffect(() => {
-    const code = route.params?.code
+    let code = route.path
 
     // Screen hasn't been open through a link
     if (!code) return
 
+    if (code.charAt(0) === '?') {
+      code = code.slice(1, code.length)
+    }
+
     if (ready) {
       dispatch(initActions.deepLink(code))
     }
-  }, [ready, route.params?.code])
+  }, [ready, route.path])
 
   return <Splash />
 }
diff --git a/packages/mobile/src/screens/UsernameTaken/UsernameTaken.screen.tsx b/packages/mobile/src/screens/UsernameTaken/UsernameTaken.screen.tsx
index 9e2b3dcaed..46e0549983 100644
--- a/packages/mobile/src/screens/UsernameTaken/UsernameTaken.screen.tsx
+++ b/packages/mobile/src/screens/UsernameTaken/UsernameTaken.screen.tsx
@@ -9,17 +9,17 @@ import { navigationActions } from '../../store/navigation/navigation.slice'
 
 const UsernameTakenScreen: React.FC<UsernameTakenScreenProps> = () => {
   const dispatch = useDispatch()
+
   const currentIdentity = useSelector(identity.selectors.currentIdentity)
+
   const usernameRegistered = currentIdentity?.userCertificate != null
-  const error = useSelector(errors.selectors.registrarErrors)
+
   const registeredUsers = useSelector(users.selectors.certificatesMapping)
 
+  const error = useSelector(errors.selectors.registrarErrors)
+
   const handleBackButton = useCallback(() => {
-    dispatch(
-      navigationActions.replaceScreen({
-        screen: ScreenNames.ChannelListScreen,
-      })
-    )
+    dispatch(navigationActions.pop())
   }, [dispatch])
 
   const handleAction = (nickname: string) => {
diff --git a/packages/mobile/src/store/nativeServices/showNotification/showNotification.saga.test.ts b/packages/mobile/src/store/nativeServices/showNotification/showNotification.saga.test.ts
index 8ede98660d..9265012dd4 100644
--- a/packages/mobile/src/store/nativeServices/showNotification/showNotification.saga.test.ts
+++ b/packages/mobile/src/store/nativeServices/showNotification/showNotification.saga.test.ts
@@ -129,7 +129,7 @@ describe('showNotificationSaga', () => {
           },
           [StoreKeys.Navigation]: {
             ...new NavigationState(),
-            currentScreen: ScreenNames.ChannelScreen,
+            backStack: [ScreenNames.ChannelScreen],
           },
         }
       )
@@ -174,7 +174,7 @@ describe('showNotificationSaga', () => {
           },
           [StoreKeys.Navigation]: {
             ...new NavigationState(),
-            currentScreen: ScreenNames.ChannelScreen,
+            backStack: [ScreenNames.ChannelScreen],
           },
         }
       )
@@ -213,7 +213,7 @@ describe('showNotificationSaga', () => {
           },
           [StoreKeys.Navigation]: {
             ...new NavigationState(),
-            currentScreen: ScreenNames.ChannelScreen,
+            backStack: [ScreenNames.ChannelScreen],
           },
         }
       )
diff --git a/packages/mobile/src/store/navigation/navigation.master.saga.ts b/packages/mobile/src/store/navigation/navigation.master.saga.ts
index 9867a9e006..6735316601 100644
--- a/packages/mobile/src/store/navigation/navigation.master.saga.ts
+++ b/packages/mobile/src/store/navigation/navigation.master.saga.ts
@@ -3,11 +3,13 @@ import { navigationActions } from './navigation.slice'
 import { redirectionSaga } from './redirection/redirection.saga'
 import { navigationSaga } from './navigation/navigation.saga'
 import { replaceScreenSaga } from './replaceScreen/replaceScreen.saga'
+import { popSaga } from './pop/pop.saga'
 
 export function* navigationMasterSaga(): Generator {
   yield all([
     takeEvery(navigationActions.redirection.type, redirectionSaga),
     takeEvery(navigationActions.navigation.type, navigationSaga),
     takeEvery(navigationActions.replaceScreen.type, replaceScreenSaga),
+    takeEvery(navigationActions.pop.type, popSaga),
   ])
 }
diff --git a/packages/mobile/src/store/navigation/navigation.selectors.ts b/packages/mobile/src/store/navigation/navigation.selectors.ts
index b180fb2d58..4553b47f44 100644
--- a/packages/mobile/src/store/navigation/navigation.selectors.ts
+++ b/packages/mobile/src/store/navigation/navigation.selectors.ts
@@ -5,7 +5,7 @@ import { CreatedSelectors, StoreState } from '../store.types'
 
 const navigationSlice: CreatedSelectors[StoreKeys.Navigation] = (state: StoreState) => state[StoreKeys.Navigation]
 
-export const currentScreen = createSelector(navigationSlice, reducerState => reducerState.currentScreen)
+export const currentScreen = createSelector(navigationSlice, reducerState => reducerState.backStack.slice(-1)[0])
 
 export const contextMenuVisibility = (menu: MenuName) =>
   createSelector(navigationSlice, reducerState => {
diff --git a/packages/mobile/src/store/navigation/navigation.slice.ts b/packages/mobile/src/store/navigation/navigation.slice.ts
index 6a1d1a1b43..fd9b45717a 100644
--- a/packages/mobile/src/store/navigation/navigation.slice.ts
+++ b/packages/mobile/src/store/navigation/navigation.slice.ts
@@ -4,7 +4,7 @@ import { ScreenNames } from '../../const/ScreenNames.enum'
 import { MenuName } from '../../const/MenuNames.enum'
 
 export class NavigationState {
-  public currentScreen: ScreenNames = ScreenNames.SplashScreen
+  public backStack: ScreenNames[] = [ScreenNames.SplashScreen]
   public confirmationBox: ConfirmationBox = {
     open: false,
     args: {},
@@ -53,16 +53,19 @@ export const navigationSlice = createSlice({
     redirection: state => state,
     navigation: (state, action: PayloadAction<NavigationPayload>) => {
       const { screen } = action.payload
-      state.currentScreen = screen
+      state.backStack.push(screen)
     },
     // Replace screen overrides last screen in backstack
     replaceScreen: (state, action: PayloadAction<NavigationPayload>) => {
       const { screen } = action.payload
-      state.currentScreen = screen
+      state.backStack.pop()
+      state.backStack.push(screen)
+    },
+    pop: state => {
+      state.backStack.pop()
     },
     setPendingNavigation: (state, action: PayloadAction<PendingNavigationPayload>) => {
       const { screen } = action.payload
-      state.currentScreen = screen
       state.pendingNavigation = screen
     },
     clearPendingNavigation: state => {
diff --git a/packages/mobile/src/store/navigation/pop/pop.saga.ts b/packages/mobile/src/store/navigation/pop/pop.saga.ts
new file mode 100644
index 0000000000..b7dc6fa416
--- /dev/null
+++ b/packages/mobile/src/store/navigation/pop/pop.saga.ts
@@ -0,0 +1,8 @@
+import { PayloadAction } from '@reduxjs/toolkit'
+import { call } from 'typed-redux-saga'
+import { navigationActions } from '../navigation.slice'
+import { pop } from '../../../RootNavigation'
+
+export function* popSaga(_action: PayloadAction<ReturnType<typeof navigationActions.pop>['payload']>): Generator {
+  yield* call(pop)
+}
diff --git a/packages/mobile/src/store/navigation/redirection/redirection.saga.ts b/packages/mobile/src/store/navigation/redirection/redirection.saga.ts
index f05f04593d..a2f60b5519 100644
--- a/packages/mobile/src/store/navigation/redirection/redirection.saga.ts
+++ b/packages/mobile/src/store/navigation/redirection/redirection.saga.ts
@@ -3,7 +3,7 @@ import { initSelectors } from '../../init/init.selectors'
 import { navigationSelectors } from '../navigation.selectors'
 import { navigationActions } from '../navigation.slice'
 import { ScreenNames } from '../../../const/ScreenNames.enum'
-import { identity, publicChannels, users } from '@quiet/state-manager'
+import { identity } from '@quiet/state-manager'
 import { initActions } from '../../init/init.slice'
 
 export function* redirectionSaga(): Generator {
@@ -25,34 +25,10 @@ export function* redirectionSaga(): Generator {
     return
   }
 
-  const isUsernameTaken = yield* select(identity.selectors.usernameTaken)
-
-  if (isUsernameTaken) {
-    yield* put(
-      navigationActions.replaceScreen({
-        screen: ScreenNames.UsernameTakenScreen,
-      })
-    )
-  }
-
-  const duplicateCerts = yield* select(users.selectors.duplicateCerts)
-
-  if (duplicateCerts) {
-    yield* put(
-      navigationActions.replaceScreen({
-        screen: ScreenNames.PossibleImpersonationAttackScreen,
-      })
-    )
-    return
-  }
-
   // If user belongs to a community, let him directly into the app
-  // Check while QA session!
-  const currentChannelDisplayableMessages = yield* select(publicChannels.selectors.currentChannelMessagesMergedBySender)
-  const areMessagesLoaded = Object.values(currentChannelDisplayableMessages).length > 0
   const communityMembership = yield* select(identity.selectors.communityMembership)
 
-  if (communityMembership && areMessagesLoaded) {
+  if (communityMembership) {
     yield* put(
       navigationActions.replaceScreen({
         screen: ScreenNames.ChannelListScreen,
diff --git a/packages/mobile/src/tests/duplicateUsername.test.tsx b/packages/mobile/src/tests/duplicateUsername.test.tsx
new file mode 100644
index 0000000000..769b3ebcfc
--- /dev/null
+++ b/packages/mobile/src/tests/duplicateUsername.test.tsx
@@ -0,0 +1,68 @@
+import React from 'react'
+import '@testing-library/jest-native/extend-expect'
+import MockedSocket from 'socket.io-mock'
+import { ioMock } from '../setupTests'
+import { prepareStore } from './utils/prepareStore'
+import { renderComponent } from './utils/renderComponent'
+import { FactoryGirl } from 'factory-girl'
+import { getFactory, communities, identity, users } from '@quiet/state-manager'
+import { ScreenNames } from '../const/ScreenNames.enum'
+import { initActions } from '../store/init/init.slice'
+import { ChannelListScreen } from '../screens/ChannelList/ChannelList.screen'
+import { navigationSelectors } from '../store/navigation/navigation.selectors'
+import { navigationActions } from '../store/navigation/navigation.slice'
+
+describe('Duplicate username warning', () => {
+  let socket: MockedSocket
+
+  let factory: FactoryGirl
+
+  beforeEach(async () => {
+    socket = new MockedSocket()
+    ioMock.mockImplementation(() => socket)
+  })
+
+  it("Display prompt for username change if it's already taken", async () => {
+    const { store, root } = await prepareStore({}, socket)
+
+    store.dispatch(initActions.setStoreReady())
+
+    factory = await getFactory(store)
+
+    const community = await factory.create<ReturnType<typeof communities.actions.addNewCommunity>['payload']>(
+      'Community'
+    )
+
+    const alice = (
+      await factory.build<typeof identity.actions.addNewIdentity>('Identity', {
+        id: community.id,
+        nickname: 'alice',
+      })
+    ).payload
+
+    store.dispatch(
+      users.actions.storeUserCertificate({
+        certificate: alice.userCertificate || 'certificate_alice',
+      })
+    )
+
+    await factory.create<ReturnType<typeof identity.actions.addNewIdentity>['payload']>('Identity', {
+      id: community.id,
+      nickname: 'alice',
+      userCertificate: null,
+    })
+
+    store.dispatch(navigationActions.navigation({ screen: ScreenNames.ChannelListScreen }))
+
+    renderComponent(<ChannelListScreen />, store)
+
+    // Confirm there's duplication of usernames
+    const usernameTaken = identity.selectors.usernameTaken(store.getState())
+    expect(usernameTaken).toBe(true)
+
+    const currentScreen = navigationSelectors.currentScreen(store.getState())
+    expect(currentScreen).toBe(ScreenNames.UsernameTakenScreen)
+
+    root?.cancel()
+  })
+})
diff --git a/packages/mobile/src/tests/possibleImpersonationAttack.test.tsx b/packages/mobile/src/tests/possibleImpersonationAttack.test.tsx
index d427c06030..80e8b4963e 100644
--- a/packages/mobile/src/tests/possibleImpersonationAttack.test.tsx
+++ b/packages/mobile/src/tests/possibleImpersonationAttack.test.tsx
@@ -1,17 +1,15 @@
 import React from 'react'
 import '@testing-library/jest-native/extend-expect'
-import { act } from '@testing-library/react-native'
 import MockedSocket from 'socket.io-mock'
 import { ioMock } from '../setupTests'
 import { prepareStore } from './utils/prepareStore'
 import { renderComponent } from './utils/renderComponent'
 import { FactoryGirl } from 'factory-girl'
 import { getFactory, communities, identity, users } from '@quiet/state-manager'
-import { navigationActions } from '../store/navigation/navigation.slice'
-import { PossibleImpersonationAttackScreen } from '../screens/PossibleImpersonationAttack/PossibleImpersonationAttack.screen'
 import { ScreenNames } from '../const/ScreenNames.enum'
-import { navigationSelectors } from '../store/navigation/navigation.selectors'
+import { ChannelListScreen } from '../screens/ChannelList/ChannelList.screen'
 import { initActions } from '../store/init/init.slice'
+import { navigationSelectors } from '../store/navigation/navigation.selectors'
 
 describe('Possible Impersonation Attack', () => {
   let socket: MockedSocket
@@ -23,9 +21,11 @@ describe('Possible Impersonation Attack', () => {
     ioMock.mockImplementation(() => socket)
   })
 
-  it('Open modal when certifcates are duplicated', async () => {
+  it('Display warning when certifcates are duplicated', async () => {
     const { store, root } = await prepareStore({}, socket)
+
     store.dispatch(initActions.setStoreReady())
+
     factory = await getFactory(store)
 
     const community = await factory.create<ReturnType<typeof communities.actions.addNewCommunity>['payload']>(
@@ -37,17 +37,6 @@ describe('Possible Impersonation Attack', () => {
       nickname: 'alice',
     })
 
-    const route: { key: string; name: ScreenNames.PossibleImpersonationAttackScreen; path?: string | undefined } = {
-      key: '',
-      name: ScreenNames.PossibleImpersonationAttackScreen,
-    }
-    renderComponent(
-      <>
-        <PossibleImpersonationAttackScreen route={route} />
-      </>,
-      store
-    )
-
     const cert1 =
       'MIIDeDCCAx6gAwIBAgIGAYr6Jw3hMAoGCCqGSM49BAMCMA8xDTALBgNVBAMTBGZyZmQwHhcNMjMxMDA0MTAwNjE4WhcNMzAwMTMxMjMwMDAwWjBJMUcwRQYDVQQDEz5tenhydWhyNWJzdGt3dmp3eWJnZ2Y2M2Jma2dreWw0aWs0bG5lanN1YnFlaG9td3Vpbm43d3JxZC5vbmlvbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGcKhXLUNjkS9+xd0hYfJBOA7bXB5LwZojhzgBQps3SW/CSR6ABiAuirdP0x/byxTXSkZY23lBkvc5CqMjWe3lWjggIqMIICJjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIAgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwggFHBgkqhkiG9w0BCQwEggE4BIIBNAXhwXxmLy7Gg5uonlWXiqRUimGLj2cPbAoK9DnKHkcohqdLvEzyz6rM7KBewO068fag0d/PR0uh37Oyb7d/JAbBjhJmf8wOl2HfLTThPEEH8isy3bxHXx4Ir5prVVk1zx8UiXtPAu6gK41FY5Oin6SpV07MBewqQGcbCovcbBSwkp6EXmLXPOGgmpFlQf5CNGIs3YqPD+Ll1vn8Lq5QIGCa210Pq/T65mrPsXVAw2vJO6DFRIAGrAF5VxDS8G2dSwnDnje+bD2NO8qlfwFdO3bkDeheOqZXCSxlPA6q1bY34qYR2zrwSiQCjRiCQjifRCmF2Jg4ojzLGUL0pKdvi+8fDQXollmazh5boJWN9GRy+1sDLTk01cW2kF7esew5PlDi8kX0v2hY+XsR5eQga1j3MkXkMBgGCisGAQQBg4wbAgEEChMIdXNlcm5hbWUwPQYJKwYBAgEPAwEBBDATLlFtUHF6THFheFk1UmI4VlpjM1VuZmlXZXRxVDZKWkp6SnRjWVFXNmhXTENvRXIwSQYDVR0RBEIwQII+bXp4cnVocjVic3Rrd3Zqd3liZ2dmNjNiZmtna3lsNGlrNGxuZWpzdWJxZWhvbXd1aW5uN3dycWQub25pb24wCgYIKoZIzj0EAwIDSAAwRQIhAJx4YX8KtOA4WGAWzW0M7FvuoblNOb370521GsfuHfbMAiBEYQ4l074oUEF2DTVK1agJlhMR5USRxav5xEpx2ujMeA=='
 
@@ -66,17 +55,14 @@ describe('Possible Impersonation Attack', () => {
       })
     )
 
-    await act(async () => {})
-
-    store.dispatch(navigationActions.redirection())
-
-    await act(async () => {})
+    renderComponent(<ChannelListScreen />, store)
 
     const duplicateCerts = users.selectors.duplicateCerts(store.getState())
-    const currentScreen = navigationSelectors.currentScreen(store.getState())
+    expect(duplicateCerts).toBe(true)
 
+    const currentScreen = navigationSelectors.currentScreen(store.getState())
     expect(currentScreen).toBe(ScreenNames.PossibleImpersonationAttackScreen)
-    expect(duplicateCerts).toBeTruthy()
+
     root?.cancel()
   })
 })
diff --git a/packages/mobile/src/tests/splash.screen.test.tsx b/packages/mobile/src/tests/splash.screen.test.tsx
index 2b2970ef1e..c84567b89d 100644
--- a/packages/mobile/src/tests/splash.screen.test.tsx
+++ b/packages/mobile/src/tests/splash.screen.test.tsx
@@ -25,12 +25,10 @@ describe('Splash screen', () => {
     const invitationCode =
       'QmZoiJNAvCffeEHBjk766nLuKVdkxkAT7wfFJDPPLsbKSE=y7yczmugl2tekami7sbdz5pfaemvx7bahwthrdvcbzw5vex2crsr26qd'
 
-    const route: { key: string; name: ScreenNames.SplashScreen; params: { code?: string } } = {
+    const route: { key: string; name: ScreenNames.SplashScreen; path: string } = {
       key: '',
       name: ScreenNames.SplashScreen,
-      params: {
-        code: invitationCode,
-      },
+      path: invitationCode,
     }
 
     renderComponent(
diff --git a/packages/state-manager/CHANGELOG.md b/packages/state-manager/CHANGELOG.md
index b2db960fd5..44344e4dff 100644
--- a/packages/state-manager/CHANGELOG.md
+++ b/packages/state-manager/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.6](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.5...@quiet/state-manager@2.0.1-alpha.6) (2023-10-13)
+
+**Note:** Version bump only for package @quiet/state-manager
+
+
+
+
+
+## [2.0.1-alpha.5](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.4...@quiet/state-manager@2.0.1-alpha.5) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/state-manager
+
+
+
+
+
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.3...@quiet/state-manager@2.0.1-alpha.4) (2023-10-11)
+
+**Note:** Version bump only for package @quiet/state-manager
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/state-manager@2.0.1-alpha.2...@quiet/state-manager@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/state-manager
diff --git a/packages/state-manager/package-lock.json b/packages/state-manager/package-lock.json
index f656d50c45..0913130be1 100644
--- a/packages/state-manager/package-lock.json
+++ b/packages/state-manager/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/state-manager",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/state-manager",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.6",
       "license": "ISC",
       "dependencies": {
         "@reduxjs/toolkit": "^1.9.1",
diff --git a/packages/state-manager/package.json b/packages/state-manager/package.json
index 174becc579..c2980dd535 100644
--- a/packages/state-manager/package.json
+++ b/packages/state-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/state-manager",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.6",
   "description": "",
   "main": "lib/index.js",
   "private": true,
@@ -23,9 +23,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@quiet/common": "^2.0.1-alpha.3",
-    "@quiet/logger": "^2.0.1-alpha.3",
-    "@quiet/types": "^2.0.1-alpha.3",
+    "@quiet/common": "^2.0.1-alpha.4",
+    "@quiet/logger": "^2.0.1-alpha.4",
+    "@quiet/types": "^2.0.1-alpha.4",
     "@reduxjs/toolkit": "^1.9.1",
     "factory-girl": "^5.0.4",
     "get-port": "^5.1.1",
@@ -44,8 +44,8 @@
     "@babel/preset-env": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
     "@peculiar/webcrypto": "1.4.3",
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
-    "@quiet/identity": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
+    "@quiet/identity": "^2.0.1-alpha.4",
     "@types/factory-girl": "^5.0.8",
     "@types/jest": "^26.0.24",
     "@types/luxon": "^2.0.0",
diff --git a/packages/state-manager/src/sagas/communities/communities.selectors.test.ts b/packages/state-manager/src/sagas/communities/communities.selectors.test.ts
index 966e5cd3f2..50233bbe90 100644
--- a/packages/state-manager/src/sagas/communities/communities.selectors.test.ts
+++ b/packages/state-manager/src/sagas/communities/communities.selectors.test.ts
@@ -125,6 +125,12 @@ describe('communitiesSelectors', () => {
         certificates: [identity.userCertificate || ''],
       })
     )
+
+    store.dispatch(
+      usersActions.setAllCerts({
+        certificates: [identity.userCertificate || ''],
+      })
+    )
     const ownerNickname = communitiesSelectors.ownerNickname(store.getState())
     expect(ownerNickname).toEqual(identity.nickname)
   })
diff --git a/packages/state-manager/src/sagas/identity/identity.selectors.ts b/packages/state-manager/src/sagas/identity/identity.selectors.ts
index 9004adb288..8e9b48cc98 100644
--- a/packages/state-manager/src/sagas/identity/identity.selectors.ts
+++ b/packages/state-manager/src/sagas/identity/identity.selectors.ts
@@ -2,7 +2,7 @@ import { StoreKeys } from '../store.keys'
 import { createSelector } from '@reduxjs/toolkit'
 import { identityAdapter } from './identity.adapter'
 import { type CreatedSelectors, type StoreState } from '../store.types'
-import { communitiesSelectors, selectCommunities } from '../communities/communities.selectors'
+import { communitiesSelectors, selectCommunities, currentCommunity } from '../communities/communities.selectors'
 import { certificatesMapping } from '../users/users.selectors'
 
 const identitySlice: CreatedSelectors[StoreKeys.Identity] = (state: StoreState) => state[StoreKeys.Identity]
@@ -22,8 +22,8 @@ export const currentIdentity = createSelector(
   }
 )
 
-export const communityMembership = createSelector(currentIdentity, identity => {
-  return Boolean(identity?.userCsr)
+export const communityMembership = createSelector(currentIdentity, currentCommunity, (identity, community) => {
+  return Boolean(identity?.userCsr && community?.name)
 })
 
 export const hasCertificate = createSelector(currentIdentity, identity => {
diff --git a/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts b/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts
index a03438bd5d..350307a1af 100644
--- a/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts
+++ b/packages/state-manager/src/sagas/identity/updateCertificate/updateCertificate.saga.ts
@@ -5,29 +5,29 @@ import { identitySelectors } from '../identity.selectors'
 import { loadCSR, pubKeyMatch } from '@quiet/identity'
 import { identityActions } from '../identity.slice'
 import { communitiesSelectors } from '../../communities/communities.selectors'
+import { usersActions } from '../../users/users.slice'
 
 export function* updateCertificateSaga(action: PayloadAction<SendCertificatesResponse>): Generator {
   const certificate = yield* select(identitySelectors.hasCertificate)
   const communityId = yield* select(communitiesSelectors.currentCommunityId)
-
-  if (certificate) return
-
   const csr = yield* select(identitySelectors.csr)
 
-  if (!csr?.userCsr) return
+  if (!certificate && csr?.userCsr) {
+    const parsedCsr = yield* call(loadCSR, csr?.userCsr)
 
-  const parsedCsr = yield* call(loadCSR, csr?.userCsr)
+    const cert = action.payload.certificates.find(cert => {
+      if (pubKeyMatch(cert, parsedCsr)) return cert
+    })
 
-  const cert = action.payload.certificates.find(cert => {
-    if (pubKeyMatch(cert, parsedCsr)) return cert
-  })
-
-  if (cert) {
-    yield* put(
-      identityActions.storeUserCertificate({
-        userCertificate: cert,
-        communityId,
-      })
-    )
+    if (cert) {
+      yield* put(
+        identityActions.storeUserCertificate({
+          userCertificate: cert,
+          communityId,
+        })
+      )
+    }
   }
+
+  yield* put(usersActions.setAllCerts(action.payload))
 }
diff --git a/packages/state-manager/src/sagas/users/users.slice.test.ts b/packages/state-manager/src/sagas/users/users.slice.test.ts
index 8beaa59807..aeb64ea22a 100644
--- a/packages/state-manager/src/sagas/users/users.slice.test.ts
+++ b/packages/state-manager/src/sagas/users/users.slice.test.ts
@@ -60,6 +60,12 @@ describe('users reducer', () => {
       })
     )
 
+    store.dispatch(
+      usersActions.setAllCerts({
+        certificates: [userCertString],
+      })
+    )
+
     const certificates = usersSelectors.certificates(store.getState())
 
     expect(certificates[userPubKey]).toEqual(parsedCert)
diff --git a/packages/state-manager/src/sagas/users/users.slice.ts b/packages/state-manager/src/sagas/users/users.slice.ts
index 75e56531f3..27ecdf1e65 100644
--- a/packages/state-manager/src/sagas/users/users.slice.ts
+++ b/packages/state-manager/src/sagas/users/users.slice.ts
@@ -17,7 +17,9 @@ export const usersSlice = createSlice({
     storeUserCertificate: (state, action: PayloadAction<{ certificate: string }>) => {
       certificatesAdapter.addOne(state.certificates, parseCertificate(action.payload.certificate))
     },
-    responseSendCertificates: (state, action: PayloadAction<SendCertificatesResponse>) => {
+    responseSendCertificates: (state, action: PayloadAction<SendCertificatesResponse>) => {},
+
+    setAllCerts: (state, action: PayloadAction<SendCertificatesResponse>) => {
       certificatesAdapter.setAll(
         state.certificates,
         Object.values(action.payload.certificates).map(item => {
diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md
index 4e45aa8f7b..81dff1e244 100644
--- a/packages/types/CHANGELOG.md
+++ b/packages/types/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.0.1-alpha.4](https://github.com/TryQuiet/quiet/compare/@quiet/types@2.0.1-alpha.3...@quiet/types@2.0.1-alpha.4) (2023-10-12)
+
+**Note:** Version bump only for package @quiet/types
+
+
+
+
+
 ## [2.0.1-alpha.3](https://github.com/TryQuiet/quiet/compare/@quiet/types@2.0.1-alpha.2...@quiet/types@2.0.1-alpha.3) (2023-10-10)
 
 **Note:** Version bump only for package @quiet/types
diff --git a/packages/types/package-lock.json b/packages/types/package-lock.json
index a678fa5b49..edfa66cb7f 100644
--- a/packages/types/package-lock.json
+++ b/packages/types/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@quiet/types",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@quiet/types",
-      "version": "2.0.1-alpha.3",
+      "version": "2.0.1-alpha.4",
       "license": "ISC",
       "dependencies": {
         "cross-env": "^5.2.0",
diff --git a/packages/types/package.json b/packages/types/package.json
index e5e9212465..39e3644734 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@quiet/types",
-  "version": "2.0.1-alpha.3",
+  "version": "2.0.1-alpha.4",
   "description": "Common monorepo types",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,7 +18,7 @@
     "rmDist": "rimraf lib/"
   },
   "devDependencies": {
-    "@quiet/eslint-config": "^2.0.1-alpha.3",
+    "@quiet/eslint-config": "^2.0.1-alpha.4",
     "@reduxjs/toolkit": "^1.9.1",
     "@types/jest": "^26.0.23",
     "@types/node": "^17.0.21",