diff --git a/api.planx.uk/modules/flows/moveFlow/service.ts b/api.planx.uk/modules/flows/moveFlow/service.ts
index c329162d87..69cc461c71 100644
--- a/api.planx.uk/modules/flows/moveFlow/service.ts
+++ b/api.planx.uk/modules/flows/moveFlow/service.ts
@@ -1,10 +1,11 @@
 import { gql } from "graphql-request";
 import { Flow } from "../../../types.js";
-import { $public, getClient } from "../../../client/index.js";
+import { getClient } from "../../../client/index.js";
 import { Team } from "@opensystemslab/planx-core/types";
 
 export const moveFlow = async (flowId: string, teamSlug: string) => {
-  const team = await $public.team.getBySlug(teamSlug);
+  const $client = getClient();
+  const team = await $client.team.getBySlug(teamSlug);
   if (!team)
     throw Error(
       `Unable to find a team matching slug ${teamSlug}, exiting move`,
diff --git a/api.planx.uk/package.json b/api.planx.uk/package.json
index f6a559921f..8b51566938 100644
--- a/api.planx.uk/package.json
+++ b/api.planx.uk/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@airbrake/node": "^2.1.8",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#06369b9",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#8162d4f",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "aws-sdk": "^2.1467.0",
diff --git a/api.planx.uk/pnpm-lock.yaml b/api.planx.uk/pnpm-lock.yaml
index b51b4a22a9..8fe53147e7 100644
--- a/api.planx.uk/pnpm-lock.yaml
+++ b/api.planx.uk/pnpm-lock.yaml
@@ -14,8 +14,8 @@ dependencies:
     specifier: ^2.1.8
     version: 2.1.8
   '@opensystemslab/planx-core':
-    specifier: git+https://github.com/theopensystemslab/planx-core#06369b9
-    version: github.com/theopensystemslab/planx-core/06369b9
+    specifier: git+https://github.com/theopensystemslab/planx-core#8162d4f
+    version: github.com/theopensystemslab/planx-core/8162d4f
   '@types/isomorphic-fetch':
     specifier: ^0.0.36
     version: 0.0.36
@@ -6236,8 +6236,8 @@ packages:
     resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
     dev: false
 
-  github.com/theopensystemslab/planx-core/06369b9:
-    resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/06369b9}
+  github.com/theopensystemslab/planx-core/8162d4f:
+    resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/8162d4f}
     name: '@opensystemslab/planx-core'
     version: 1.0.0
     prepare: true
diff --git a/e2e/tests/api-driven/package.json b/e2e/tests/api-driven/package.json
index 99ba05f8e5..25312512f9 100644
--- a/e2e/tests/api-driven/package.json
+++ b/e2e/tests/api-driven/package.json
@@ -7,7 +7,7 @@
   "packageManager": "pnpm@8.6.6",
   "dependencies": {
     "@cucumber/cucumber": "^9.3.0",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#06369b9",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#8162d4f",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "dotenv-expand": "^10.0.0",
diff --git a/e2e/tests/api-driven/pnpm-lock.yaml b/e2e/tests/api-driven/pnpm-lock.yaml
index 1c0cab9292..b5fc5c2187 100644
--- a/e2e/tests/api-driven/pnpm-lock.yaml
+++ b/e2e/tests/api-driven/pnpm-lock.yaml
@@ -9,8 +9,8 @@ dependencies:
     specifier: ^9.3.0
     version: 9.3.0
   '@opensystemslab/planx-core':
-    specifier: git+https://github.com/theopensystemslab/planx-core#06369b9
-    version: github.com/theopensystemslab/planx-core/06369b9
+    specifier: git+https://github.com/theopensystemslab/planx-core#8162d4f
+    version: github.com/theopensystemslab/planx-core/8162d4f
   axios:
     specifier: ^1.7.4
     version: 1.7.4
@@ -2932,8 +2932,8 @@ packages:
     resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
     dev: false
 
-  github.com/theopensystemslab/planx-core/06369b9:
-    resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/06369b9}
+  github.com/theopensystemslab/planx-core/8162d4f:
+    resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/8162d4f}
     name: '@opensystemslab/planx-core'
     version: 1.0.0
     prepare: true
diff --git a/e2e/tests/ui-driven/package.json b/e2e/tests/ui-driven/package.json
index 75190589f8..58640c9a17 100644
--- a/e2e/tests/ui-driven/package.json
+++ b/e2e/tests/ui-driven/package.json
@@ -8,7 +8,7 @@
     "postinstall": "./install-dependencies.sh"
   },
   "dependencies": {
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#06369b9",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#8162d4f",
     "axios": "^1.7.4",
     "dotenv": "^16.3.1",
     "eslint": "^8.56.0",
diff --git a/e2e/tests/ui-driven/pnpm-lock.yaml b/e2e/tests/ui-driven/pnpm-lock.yaml
index 6509490a9c..a1e14ea419 100644
--- a/e2e/tests/ui-driven/pnpm-lock.yaml
+++ b/e2e/tests/ui-driven/pnpm-lock.yaml
@@ -6,8 +6,8 @@ settings:
 
 dependencies:
   '@opensystemslab/planx-core':
-    specifier: git+https://github.com/theopensystemslab/planx-core#06369b9
-    version: github.com/theopensystemslab/planx-core/06369b9
+    specifier: git+https://github.com/theopensystemslab/planx-core#8162d4f
+    version: github.com/theopensystemslab/planx-core/8162d4f
   axios:
     specifier: ^1.7.4
     version: 1.7.4
@@ -2674,8 +2674,8 @@ packages:
     resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
     dev: false
 
-  github.com/theopensystemslab/planx-core/06369b9:
-    resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/06369b9}
+  github.com/theopensystemslab/planx-core/8162d4f:
+    resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/8162d4f}
     name: '@opensystemslab/planx-core'
     version: 1.0.0
     prepare: true
diff --git a/editor.planx.uk/package.json b/editor.planx.uk/package.json
index 57f7f3ab94..6a773dd6bc 100644
--- a/editor.planx.uk/package.json
+++ b/editor.planx.uk/package.json
@@ -15,7 +15,7 @@
     "@mui/material": "^5.15.10",
     "@mui/utils": "^5.15.11",
     "@opensystemslab/map": "1.0.0-alpha.3",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#06369b9",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#8162d4f",
     "@tiptap/core": "^2.4.0",
     "@tiptap/extension-bold": "^2.0.3",
     "@tiptap/extension-bubble-menu": "^2.1.13",
diff --git a/editor.planx.uk/pnpm-lock.yaml b/editor.planx.uk/pnpm-lock.yaml
index 7e678d3e01..145e900cd6 100644
--- a/editor.planx.uk/pnpm-lock.yaml
+++ b/editor.planx.uk/pnpm-lock.yaml
@@ -47,8 +47,8 @@ dependencies:
     specifier: 1.0.0-alpha.3
     version: 1.0.0-alpha.3
   '@opensystemslab/planx-core':
-    specifier: git+https://github.com/theopensystemslab/planx-core#06369b9
-    version: github.com/theopensystemslab/planx-core/06369b9(@types/react@18.2.45)
+    specifier: git+https://github.com/theopensystemslab/planx-core#8162d4f
+    version: github.com/theopensystemslab/planx-core/8162d4f(@types/react@18.2.45)
   '@tiptap/core':
     specifier: ^2.4.0
     version: 2.4.0(@tiptap/pm@2.0.3)
@@ -21079,6 +21079,7 @@ packages:
 
   /workbox-google-analytics@6.6.0:
     resolution: {integrity: sha512-p4DJa6OldXWd6M9zRl0H6vB9lkrmqYFkRQ2xEiNdBFp9U0LhsGO7hsBscVEyH9H2/3eZZt8c97NB2FD9U2NJ+Q==}
+    deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained
     dependencies:
       workbox-background-sync: 6.6.0
       workbox-core: 6.6.0
@@ -21378,9 +21379,9 @@ packages:
       use-sync-external-store: 1.2.0(react@18.2.0)
     dev: false
 
-  github.com/theopensystemslab/planx-core/06369b9(@types/react@18.2.45):
-    resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/06369b9}
-    id: github.com/theopensystemslab/planx-core/06369b9
+  github.com/theopensystemslab/planx-core/8162d4f(@types/react@18.2.45):
+    resolution: {tarball: https://codeload.github.com/theopensystemslab/planx-core/tar.gz/8162d4f}
+    id: github.com/theopensystemslab/planx-core/8162d4f
     name: '@opensystemslab/planx-core'
     version: 1.0.0
     prepare: true