diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2338258d82..39973dc017 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Build changelog
         id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v4
+        uses: simplex-chat/release-changelog-builder-action@v4
         with:
           configuration: .github/changelog_conf.json
           failOnError: true
@@ -42,7 +42,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create release
-        uses: softprops/action-gh-release@v1
+        uses: simplex-chat/action-gh-release@v1
         with:
           body: ${{ steps.build_changelog.outputs.changelog }}
           prerelease: true
@@ -97,7 +97,7 @@ jobs:
 
       - name: Configure pagefile (Windows)
         if: matrix.os == 'windows-latest'
-        uses: al-cheb/configure-pagefile-action@v1.3
+        uses: simplex-chat/configure-pagefile-action@v1.3
         with:
           minimum-size: 16GB
           maximum-size: 16GB
@@ -107,7 +107,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: simplex-chat/setup-haskell-action@v2
         with:
           ghc-version: ${{ matrix.ghc }}
           cabal-version: "3.10.1.0"
@@ -179,7 +179,7 @@ jobs:
 
       - name: Unix upload CLI binary to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
+        uses: simplex-chat/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.unix_cli_build.outputs.bin_path }}
@@ -188,7 +188,7 @@ jobs:
 
       - name: Unix update CLI binary hash
         if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os != 'windows-latest'
-        uses: softprops/action-gh-release@v1
+        uses: simplex-chat/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -242,7 +242,7 @@ jobs:
 
       - name: Linux upload desktop package to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
-        uses: svenstaro/upload-release-action@v2
+        uses: simplex-chat/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.linux_desktop_build.outputs.package_path }}
@@ -251,7 +251,7 @@ jobs:
 
       - name: Linux update desktop package hash
         if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && (matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04')
-        uses: softprops/action-gh-release@v1
+        uses: simplex-chat/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -261,7 +261,7 @@ jobs:
 
       - name: Linux upload AppImage to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
-        uses: svenstaro/upload-release-action@v2
+        uses: simplex-chat/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.linux_appimage_build.outputs.appimage_path }}
@@ -270,7 +270,7 @@ jobs:
 
       - name: Linux update AppImage hash
         if: startsWith(github.ref, 'refs/tags/v') && matrix.asset_name && matrix.os == 'ubuntu-20.04'
-        uses: softprops/action-gh-release@v1
+        uses: simplex-chat/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -280,7 +280,7 @@ jobs:
 
       - name: Mac upload desktop package to release
         if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
-        uses: svenstaro/upload-release-action@v2
+        uses: simplex-chat/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.mac_desktop_build.outputs.package_path }}
@@ -289,7 +289,7 @@ jobs:
 
       - name: Mac update desktop package hash
         if: startsWith(github.ref, 'refs/tags/v') && (matrix.os == 'macos-latest' || matrix.os == 'macos-13')
-        uses: softprops/action-gh-release@v1
+        uses: simplex-chat/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -319,7 +319,7 @@ jobs:
 
       - name: 'Setup MSYS2'
         if: matrix.os == 'windows-latest'
-        uses: msys2/setup-msys2@v2
+        uses: simplex-chat/setup-msys2@v2
         with:
           msystem: ucrt64
           update: true
@@ -357,7 +357,7 @@ jobs:
 
       - name: Windows upload CLI binary to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
+        uses: simplex-chat/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.windows_build.outputs.bin_path }}
@@ -366,7 +366,7 @@ jobs:
 
       - name: Windows update CLI binary hash
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: softprops/action-gh-release@v1
+        uses: simplex-chat/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -389,7 +389,7 @@ jobs:
 
       - name: Windows upload desktop package to release
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: svenstaro/upload-release-action@v2
+        uses: simplex-chat/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.windows_desktop_build.outputs.package_path }}
@@ -398,7 +398,7 @@ jobs:
 
       - name: Windows update desktop package hash
         if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
-        uses: softprops/action-gh-release@v1
+        uses: simplex-chat/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
index 6839d48aeb..5fbe8293bc 100644
--- a/.github/workflows/web.yml
+++ b/.github/workflows/web.yml
@@ -33,7 +33,7 @@ jobs:
           ./website/web.sh
 
       - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        uses: simplex-chat/actions-gh-pages@v3
         with:
           publish_dir: ./website/_site
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/src/Simplex/Chat/Options/Postgres.hs b/src/Simplex/Chat/Options/Postgres.hs
index b174ecd02e..f7c429e93e 100644
--- a/src/Simplex/Chat/Options/Postgres.hs
+++ b/src/Simplex/Chat/Options/Postgres.hs
@@ -7,11 +7,14 @@ module Simplex.Chat.Options.Postgres where
 import qualified Data.ByteString.Char8 as B
 import Foreign.C.String
 import Options.Applicative
+import Numeric.Natural (Natural)
 import Simplex.Messaging.Agent.Store.Interface (DBOpts (..))
 
 data ChatDbOpts = ChatDbOpts
   { dbConnstr :: String,
-    dbSchemaPrefix :: String
+    dbSchemaPrefix :: String,
+    dbPoolSize :: Natural,
+    dbCreateSchema :: Bool
   }
 
 chatDbOptsP :: FilePath -> String -> Parser ChatDbOpts
@@ -33,16 +36,32 @@ chatDbOptsP _appDir defaultDbName = do
           <> value "simplex_v1"
           <> showDefault
       )
-  pure ChatDbOpts {dbConnstr, dbSchemaPrefix}
+  dbPoolSize <-
+    option
+      auto
+      ( long "pool-size"
+          <> metavar "DB_POOL_SIZE"
+          <> help "Database connection pool size"
+          <> value 1
+          <> showDefault
+      )
+  dbCreateSchema <-
+    switch
+      ( long "create-schema"
+          <> help "Create database schema when it does not exist"
+      )
+  pure ChatDbOpts {dbConnstr, dbSchemaPrefix, dbPoolSize, dbCreateSchema}
 
 dbString :: ChatDbOpts -> String
 dbString ChatDbOpts {dbConnstr} = dbConnstr
 
 toDBOpts :: ChatDbOpts -> String -> Bool -> DBOpts
-toDBOpts ChatDbOpts {dbConnstr, dbSchemaPrefix} dbSuffix _keepKey =
+toDBOpts ChatDbOpts {dbConnstr, dbSchemaPrefix, dbPoolSize, dbCreateSchema} dbSuffix _keepKey =
   DBOpts
     { connstr = B.pack dbConnstr,
-      schema = if null dbSchemaPrefix then "simplex_v1" <> dbSuffix else dbSchemaPrefix <> dbSuffix
+      schema = B.pack $ if null dbSchemaPrefix then "simplex_v1" <> dbSuffix else dbSchemaPrefix <> dbSuffix,
+      poolSize = dbPoolSize,
+      createSchema = dbCreateSchema
     }
 
 chatSuffix :: String
@@ -58,11 +77,13 @@ mobileDbOpts schemaPrefix connstr = do
   pure $
     ChatDbOpts
       { dbConnstr,
-        dbSchemaPrefix
+        dbSchemaPrefix,
+        dbPoolSize = 1,
+        dbCreateSchema = True
       }
 
 removeDbKey :: ChatDbOpts -> ChatDbOpts
 removeDbKey = id
 
 errorDbStr :: DBOpts -> String
-errorDbStr DBOpts {schema} = schema
+errorDbStr DBOpts {schema} = B.unpack schema
diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs
index c41c155697..f16bc84cfd 100644
--- a/tests/ChatClient.hs
+++ b/tests/ChatClient.hs
@@ -117,7 +117,9 @@ testCoreOpts =
         { dbConnstr = testDBConnstr,
           -- dbSchemaPrefix is not used in tests (except bot tests where it's redefined),
           -- instead different schema prefix is passed per client so that single test database is used
-          dbSchemaPrefix = ""
+          dbSchemaPrefix = "",
+          dbPoolSize = 3,
+          dbCreateSchema = True
 #else
         { dbFilePrefix = "./simplex_v1", -- dbFilePrefix is not used in tests (except bot tests where it's redefined)
           dbKey = "", -- dbKey = "this is a pass-phrase to encrypt the database",