diff --git a/packages/account-portal b/packages/account-portal
index 0c050591c2..3a05f9fcbb 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit 0c050591c21d3b67dc0c9225d60cc9e2324c8dac
+Subproject commit 3a05f9fcbb77bb0b1fc6b6485ef49b07bafb2801
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index a1baa2a38b..2d6e86c2f9 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -94,7 +94,6 @@
         "dependsOn": [
           {
             "projects": [
-              "@budibase/string-templates",
               "@budibase/shared-core"
             ],
             "target": "build"
diff --git a/packages/builder/package.json b/packages/builder/package.json
index e66c747505..ced056bfcf 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -103,34 +103,6 @@
       "build": {
         "outputs": [
           "{workspaceRoot}/packages/server/builder"
-        ],
-        "dependsOn": [
-          {
-            "projects": [
-              "@budibase/string-templates"
-            ],
-            "target": "build"
-          }
-        ]
-      },
-      "dev": {
-        "dependsOn": [
-          {
-            "projects": [
-              "@budibase/string-templates"
-            ],
-            "target": "build"
-          }
-        ]
-      },
-      "test": {
-        "dependsOn": [
-          {
-            "projects": [
-              "@budibase/string-templates"
-            ],
-            "target": "build"
-          }
         ]
       }
     }
diff --git a/packages/cli/package.json b/packages/cli/package.json
index d33dcc9714..c1ba49c5e7 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -41,19 +41,5 @@
     "@types/pouchdb": "^6.4.0",
     "ts-node": "10.8.1",
     "typescript": "5.2.2"
-  },
-  "nx": {
-    "targets": {
-      "build": {
-        "dependsOn": [
-          {
-            "projects": [
-              "@budibase/string-templates"
-            ],
-            "target": "build"
-          }
-        ]
-      }
-    }
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 00f89a6445..305706e279 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -69,7 +69,6 @@
           {
             "projects": [
               "@budibase/shared-core",
-              "@budibase/string-templates",
               "@budibase/types"
             ],
             "target": "build"
@@ -81,7 +80,6 @@
           {
             "projects": [
               "@budibase/shared-core",
-              "@budibase/string-templates",
               "@budibase/types"
             ],
             "target": "build"
diff --git a/packages/pro b/packages/pro
index 29f3417c83..61837de57a 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 29f3417c831a804e1c187948b002e924342de488
+Subproject commit 61837de57acdcf05338393bf3e3598f3b1a911ad