diff --git a/jobs/ftp-poller/poetry.lock b/jobs/ftp-poller/poetry.lock
index d6c097b95..dbf4a5a12 100644
--- a/jobs/ftp-poller/poetry.lock
+++ b/jobs/ftp-poller/poetry.lock
@@ -961,6 +961,23 @@ files = [
 [package.dependencies]
 Flask = ">=0.9"
 
+[[package]]
+name = "flask-executor"
+version = "1.0.0"
+description = "An easy to use Flask wrapper for concurrent.futures"
+optional = false
+python-versions = "*"
+files = [
+    {file = "Flask-Executor-1.0.0.tar.gz", hash = "sha256:4bc113def5d9f1c7ff272ff7ba09f843468eab80469bdbd21625a111b2c8ae7b"},
+    {file = "Flask_Executor-1.0.0-py3-none-any.whl", hash = "sha256:c044dc6393326a83351e69e4ddf3686270abffeac2b599260cebf0ea5d1e93de"},
+]
+
+[package.dependencies]
+Flask = "*"
+
+[package.extras]
+test = ["flask-sqlalchemy", "pytest"]
+
 [[package]]
 name = "flask-jwt-oidc"
 version = "0.7.0"
@@ -1980,7 +1997,7 @@ files = []
 develop = false
 
 [package.dependencies]
-aiohttp = "^3.9.5"
+aiohttp = "^3.10.11"
 alembic = "1.13.1"
 attrs = "23.2.0"
 blinker = "1.7.0"
@@ -1999,6 +2016,7 @@ expiringdict = "1.2.2"
 flask = "3.0.2"
 flask-caching = "2.3.0"
 flask-cors = "5.0.0"
+flask-executor = "^1.0.0"
 flask-jwt-oidc = {git = "https://github.com/seeker25/flask-jwt-oidc.git"}
 flask-marshmallow = "1.2.0"
 flask-migrate = "4.0.7"
@@ -2048,16 +2066,16 @@ sqlalchemy = "2.0.28"
 sqlalchemy-utils = "0.41.1"
 threadloop = "1.0.2"
 thrift = "0.16.0"
-tornado = "6.4.1"
+tornado = "6.4.2"
 typing-extensions = "4.10.0"
 urllib3 = "2.2.2"
 werkzeug = "^3.0.3"
 
 [package.source]
 type = "git"
-url = "https://github.com/seeker25/sbc-pay.git"
-reference = "20767_p3"
-resolved_reference = "8b667944c9f710365984c41ffdd47bf974403758"
+url = "https://github.com/bcgov/sbc-pay.git"
+reference = "main"
+resolved_reference = "fba9ff4543243c717acd270d175c270aa635971a"
 subdirectory = "pay-api"
 
 [[package]]
@@ -3146,22 +3164,22 @@ files = [
 
 [[package]]
 name = "tornado"
-version = "6.4.1"
+version = "6.4.2"
 description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "tornado-6.4.1-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:163b0aafc8e23d8cdc3c9dfb24c5368af84a81e3364745ccb4427669bf84aec8"},
-    {file = "tornado-6.4.1-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:6d5ce3437e18a2b66fbadb183c1d3364fb03f2be71299e7d10dbeeb69f4b2a14"},
-    {file = "tornado-6.4.1-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2e20b9113cd7293f164dc46fffb13535266e713cdb87bd2d15ddb336e96cfc4"},
-    {file = "tornado-6.4.1-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ae50a504a740365267b2a8d1a90c9fbc86b780a39170feca9bcc1787ff80842"},
-    {file = "tornado-6.4.1-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:613bf4ddf5c7a95509218b149b555621497a6cc0d46ac341b30bd9ec19eac7f3"},
-    {file = "tornado-6.4.1-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:25486eb223babe3eed4b8aecbac33b37e3dd6d776bc730ca14e1bf93888b979f"},
-    {file = "tornado-6.4.1-cp38-abi3-musllinux_1_2_i686.whl", hash = "sha256:454db8a7ecfcf2ff6042dde58404164d969b6f5d58b926da15e6b23817950fc4"},
-    {file = "tornado-6.4.1-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a02a08cc7a9314b006f653ce40483b9b3c12cda222d6a46d4ac63bb6c9057698"},
-    {file = "tornado-6.4.1-cp38-abi3-win32.whl", hash = "sha256:d9a566c40b89757c9aa8e6f032bcdb8ca8795d7c1a9762910c722b1635c9de4d"},
-    {file = "tornado-6.4.1-cp38-abi3-win_amd64.whl", hash = "sha256:b24b8982ed444378d7f21d563f4180a2de31ced9d8d84443907a0a64da2072e7"},
-    {file = "tornado-6.4.1.tar.gz", hash = "sha256:92d3ab53183d8c50f8204a51e6f91d18a15d5ef261e84d452800d4ff6fc504e9"},
+    {file = "tornado-6.4.2-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:e828cce1123e9e44ae2a50a9de3055497ab1d0aeb440c5ac23064d9e44880da1"},
+    {file = "tornado-6.4.2-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:072ce12ada169c5b00b7d92a99ba089447ccc993ea2143c9ede887e0937aa803"},
+    {file = "tornado-6.4.2-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1a017d239bd1bb0919f72af256a970624241f070496635784d9bf0db640d3fec"},
+    {file = "tornado-6.4.2-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c36e62ce8f63409301537222faffcef7dfc5284f27eec227389f2ad11b09d946"},
+    {file = "tornado-6.4.2-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bca9eb02196e789c9cb5c3c7c0f04fb447dc2adffd95265b2c7223a8a615ccbf"},
+    {file = "tornado-6.4.2-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:304463bd0772442ff4d0f5149c6f1c2135a1fae045adf070821c6cdc76980634"},
+    {file = "tornado-6.4.2-cp38-abi3-musllinux_1_2_i686.whl", hash = "sha256:c82c46813ba483a385ab2a99caeaedf92585a1f90defb5693351fa7e4ea0bf73"},
+    {file = "tornado-6.4.2-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:932d195ca9015956fa502c6b56af9eb06106140d844a335590c1ec7f5277d10c"},
+    {file = "tornado-6.4.2-cp38-abi3-win32.whl", hash = "sha256:2876cef82e6c5978fde1e0d5b1f919d756968d5b4282418f3146b79b58556482"},
+    {file = "tornado-6.4.2-cp38-abi3-win_amd64.whl", hash = "sha256:908b71bf3ff37d81073356a5fadcc660eb10c1476ee6e2725588626ce7e5ca38"},
+    {file = "tornado-6.4.2.tar.gz", hash = "sha256:92bad5b4746e9879fd7bf1eb21dce4e3fc5128d71601f80005afa39237ad620b"},
 ]
 
 [[package]]
@@ -3322,4 +3340,4 @@ propcache = ">=0.2.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12"
-content-hash = "9d0d19b774c76c8851f362882b459321acf06e22d648aeac298fd26c7ae1f93a"
+content-hash = "597c3c0c00986d37821fece9db35c48a2beb4fb6b19591ba6b034280eddbcc57"
diff --git a/jobs/ftp-poller/pyproject.toml b/jobs/ftp-poller/pyproject.toml
index 42413cc2c..148d0c3cc 100644
--- a/jobs/ftp-poller/pyproject.toml
+++ b/jobs/ftp-poller/pyproject.toml
@@ -22,7 +22,7 @@ jinja2 = "^3.1.3"
 protobuf = "4.25.3"
 launchdarkly-server-sdk = "^8.2.1"
 sbc-common-components = {git = "https://github.com/bcgov/sbc-common-components.git", subdirectory = "python"}
-pay-api = {git = "https://github.com/seeker25/sbc-pay.git", branch = "20767_p3", subdirectory = "pay-api"}
+pay-api = {git = "https://github.com/bcgov/sbc-pay.git", branch = "main", subdirectory = "pay-api"}
 wheel = "^0.43.0"
 
 
diff --git a/pay-admin/poetry.lock b/pay-admin/poetry.lock
index 63079da39..cbf4ff777 100644
--- a/pay-admin/poetry.lock
+++ b/pay-admin/poetry.lock
@@ -883,6 +883,23 @@ files = [
 [package.dependencies]
 Flask = ">=0.9"
 
+[[package]]
+name = "flask-executor"
+version = "1.0.0"
+description = "An easy to use Flask wrapper for concurrent.futures"
+optional = false
+python-versions = "*"
+files = [
+    {file = "Flask-Executor-1.0.0.tar.gz", hash = "sha256:4bc113def5d9f1c7ff272ff7ba09f843468eab80469bdbd21625a111b2c8ae7b"},
+    {file = "Flask_Executor-1.0.0-py3-none-any.whl", hash = "sha256:c044dc6393326a83351e69e4ddf3686270abffeac2b599260cebf0ea5d1e93de"},
+]
+
+[package.dependencies]
+Flask = "*"
+
+[package.extras]
+test = ["flask-sqlalchemy", "pytest"]
+
 [[package]]
 name = "flask-jwt-oidc"
 version = "0.7.0"
@@ -1947,7 +1964,7 @@ files = []
 develop = false
 
 [package.dependencies]
-aiohttp = "^3.9.5"
+aiohttp = "^3.10.11"
 alembic = "1.13.1"
 attrs = "23.2.0"
 blinker = "1.7.0"
@@ -1966,6 +1983,7 @@ expiringdict = "1.2.2"
 flask = "3.0.2"
 flask-caching = "2.3.0"
 flask-cors = "5.0.0"
+flask-executor = "^1.0.0"
 flask-jwt-oidc = {git = "https://github.com/seeker25/flask-jwt-oidc.git"}
 flask-marshmallow = "1.2.0"
 flask-migrate = "4.0.7"
@@ -2015,16 +2033,16 @@ sqlalchemy = "2.0.28"
 sqlalchemy-utils = "0.41.1"
 threadloop = "1.0.2"
 thrift = "0.16.0"
-tornado = "6.4.1"
+tornado = "6.4.2"
 typing-extensions = "4.10.0"
 urllib3 = "2.2.2"
 werkzeug = "^3.0.3"
 
 [package.source]
 type = "git"
-url = "https://github.com/seeker25/sbc-pay.git"
-reference = "20767_p3"
-resolved_reference = "8b667944c9f710365984c41ffdd47bf974403758"
+url = "https://github.com/bcgov/sbc-pay.git"
+reference = "main"
+resolved_reference = "fba9ff4543243c717acd270d175c270aa635971a"
 subdirectory = "pay-api"
 
 [[package]]
@@ -3046,22 +3064,22 @@ files = [
 
 [[package]]
 name = "tornado"
-version = "6.4.1"
+version = "6.4.2"
 description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed."
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "tornado-6.4.1-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:163b0aafc8e23d8cdc3c9dfb24c5368af84a81e3364745ccb4427669bf84aec8"},
-    {file = "tornado-6.4.1-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:6d5ce3437e18a2b66fbadb183c1d3364fb03f2be71299e7d10dbeeb69f4b2a14"},
-    {file = "tornado-6.4.1-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e2e20b9113cd7293f164dc46fffb13535266e713cdb87bd2d15ddb336e96cfc4"},
-    {file = "tornado-6.4.1-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ae50a504a740365267b2a8d1a90c9fbc86b780a39170feca9bcc1787ff80842"},
-    {file = "tornado-6.4.1-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:613bf4ddf5c7a95509218b149b555621497a6cc0d46ac341b30bd9ec19eac7f3"},
-    {file = "tornado-6.4.1-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:25486eb223babe3eed4b8aecbac33b37e3dd6d776bc730ca14e1bf93888b979f"},
-    {file = "tornado-6.4.1-cp38-abi3-musllinux_1_2_i686.whl", hash = "sha256:454db8a7ecfcf2ff6042dde58404164d969b6f5d58b926da15e6b23817950fc4"},
-    {file = "tornado-6.4.1-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:a02a08cc7a9314b006f653ce40483b9b3c12cda222d6a46d4ac63bb6c9057698"},
-    {file = "tornado-6.4.1-cp38-abi3-win32.whl", hash = "sha256:d9a566c40b89757c9aa8e6f032bcdb8ca8795d7c1a9762910c722b1635c9de4d"},
-    {file = "tornado-6.4.1-cp38-abi3-win_amd64.whl", hash = "sha256:b24b8982ed444378d7f21d563f4180a2de31ced9d8d84443907a0a64da2072e7"},
-    {file = "tornado-6.4.1.tar.gz", hash = "sha256:92d3ab53183d8c50f8204a51e6f91d18a15d5ef261e84d452800d4ff6fc504e9"},
+    {file = "tornado-6.4.2-cp38-abi3-macosx_10_9_universal2.whl", hash = "sha256:e828cce1123e9e44ae2a50a9de3055497ab1d0aeb440c5ac23064d9e44880da1"},
+    {file = "tornado-6.4.2-cp38-abi3-macosx_10_9_x86_64.whl", hash = "sha256:072ce12ada169c5b00b7d92a99ba089447ccc993ea2143c9ede887e0937aa803"},
+    {file = "tornado-6.4.2-cp38-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1a017d239bd1bb0919f72af256a970624241f070496635784d9bf0db640d3fec"},
+    {file = "tornado-6.4.2-cp38-abi3-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c36e62ce8f63409301537222faffcef7dfc5284f27eec227389f2ad11b09d946"},
+    {file = "tornado-6.4.2-cp38-abi3-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bca9eb02196e789c9cb5c3c7c0f04fb447dc2adffd95265b2c7223a8a615ccbf"},
+    {file = "tornado-6.4.2-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:304463bd0772442ff4d0f5149c6f1c2135a1fae045adf070821c6cdc76980634"},
+    {file = "tornado-6.4.2-cp38-abi3-musllinux_1_2_i686.whl", hash = "sha256:c82c46813ba483a385ab2a99caeaedf92585a1f90defb5693351fa7e4ea0bf73"},
+    {file = "tornado-6.4.2-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:932d195ca9015956fa502c6b56af9eb06106140d844a335590c1ec7f5277d10c"},
+    {file = "tornado-6.4.2-cp38-abi3-win32.whl", hash = "sha256:2876cef82e6c5978fde1e0d5b1f919d756968d5b4282418f3146b79b58556482"},
+    {file = "tornado-6.4.2-cp38-abi3-win_amd64.whl", hash = "sha256:908b71bf3ff37d81073356a5fadcc660eb10c1476ee6e2725588626ce7e5ca38"},
+    {file = "tornado-6.4.2.tar.gz", hash = "sha256:92bad5b4746e9879fd7bf1eb21dce4e3fc5128d71601f80005afa39237ad620b"},
 ]
 
 [[package]]
@@ -3225,4 +3243,4 @@ propcache = ">=0.2.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12"
-content-hash = "5d35b71238ec39941f109227d088ad44d79ed6af2d770efec30b74848b06517b"
+content-hash = "449884ee1d86b60ab1c69ddf067d25f1e8a887a71ca16efc2feec4bbc9e97d76"
diff --git a/pay-admin/pyproject.toml b/pay-admin/pyproject.toml
index 21ee263dc..f38c129ec 100644
--- a/pay-admin/pyproject.toml
+++ b/pay-admin/pyproject.toml
@@ -18,7 +18,7 @@ wtforms = "^3.1.2"
 werkzeug = "^3.0.1"
 itsdangerous = "^2.1.2"
 jinja2 = "^3.1.3"
-pay-api = {git = "https://github.com/seeker25/sbc-pay.git", branch = "20767_p3", subdirectory = "pay-api"}
+pay-api = {git = "https://github.com/bcgov/sbc-pay.git", branch = "main", subdirectory = "pay-api"}
 flask-session = {extras = ["filesystem"], version = "^0.8.0"}
 
 
diff --git a/pay-api/poetry.lock b/pay-api/poetry.lock
index 8e7e987b6..be59bb81d 100644
--- a/pay-api/poetry.lock
+++ b/pay-api/poetry.lock
@@ -3012,4 +3012,4 @@ propcache = ">=0.2.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12"
-content-hash = "346b978996d0df47c61a2480869c3ccd3d47756ac972a9d5fd288c288d004928"
+content-hash = "78f4b071a4737413519e60908ce7e92ab38324cc411cfb40ccd2f50ac47a1482"
diff --git a/pay-api/pyproject.toml b/pay-api/pyproject.toml
index 0a5d931da..0b61965e6 100644
--- a/pay-api/pyproject.toml
+++ b/pay-api/pyproject.toml
@@ -71,7 +71,7 @@ sentry-sdk = {extras = ["flask"], version = "^2.8.0"}
 six = "1.16.0"
 threadloop = "1.0.2"
 thrift = "0.16.0"
-tornado = "6.4.2"
+tornado = "^6.4.2"
 typing-extensions = "4.10.0"
 urllib3 = "2.2.2"
 sbc-common-components = {git = "https://github.com/bcgov/sbc-common-components.git", subdirectory = "python"}
diff --git a/pay-queue/poetry.lock b/pay-queue/poetry.lock
index a1f1c4641..ca0a1cd6e 100644
--- a/pay-queue/poetry.lock
+++ b/pay-queue/poetry.lock
@@ -2080,9 +2080,9 @@ werkzeug = "^3.0.3"
 
 [package.source]
 type = "git"
-url = "https://github.com/Jxio/sbc-pay.git"
-reference = "24695"
-resolved_reference = "db15fe371380a5518a79dc79611e4f58a3220922"
+url = "https://github.com/bcgov/sbc-pay.git"
+reference = "main"
+resolved_reference = "fba9ff4543243c717acd270d175c270aa635971a"
 subdirectory = "pay-api"
 
 [[package]]
@@ -3289,4 +3289,4 @@ propcache = ">=0.2.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12"
-content-hash = "aa432432b8fb2c62805242106b999c512c624a7abb751765a8b8e1b46ac59961"
+content-hash = "6c1a79b267ceaf69c00825240f6e5f58f3b93c0bb9fb61d9ae5735829f90518f"
diff --git a/pay-queue/pyproject.toml b/pay-queue/pyproject.toml
index 94e683b23..0d78c391a 100644
--- a/pay-queue/pyproject.toml
+++ b/pay-queue/pyproject.toml
@@ -19,7 +19,7 @@ itsdangerous = "^2.1.2"
 protobuf = "4.25.3"
 launchdarkly-server-sdk = "^8.2.1"
 cachecontrol = "^0.14.0"
-pay-api = {git = "https://github.com/Jxio/sbc-pay.git", branch = "24695", subdirectory = "pay-api"}
+pay-api = {git = "https://github.com/bcgov/sbc-pay.git", branch = "main", subdirectory = "pay-api"}
 pg8000 = "^1.30.5"