diff --git a/lerna.json b/lerna.json
index dd5f7a9db3..37acdab0e5 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.2.58-alpha.7",
+  "version": "1.2.58",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
@@ -15,4 +15,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 4eae026f90..7eb09cedde 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.2.58-alpha.7",
+  "version": "1.2.58",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -20,7 +20,7 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "1.2.58-alpha.7",
+    "@budibase/types": "^1.2.58",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.0.1",
@@ -81,4 +81,4 @@
     "typescript": "4.7.3"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
+}
\ No newline at end of file
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 7157f0e22e..29b41b6352 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.2.58-alpha.7",
+  "version": "1.2.58",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "1.2.58-alpha.7",
+    "@budibase/string-templates": "^1.2.58",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
@@ -86,4 +86,4 @@
     "svelte-portal": "^1.0.0"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
+}
\ No newline at end of file
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 1ff505a25a..3d2398d19d 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.2.58-alpha.7",
+  "version": "1.2.58",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -69,10 +69,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.58-alpha.7",
-    "@budibase/client": "1.2.58-alpha.7",
-    "@budibase/frontend-core": "1.2.58-alpha.7",
-    "@budibase/string-templates": "1.2.58-alpha.7",
+    "@budibase/bbui": "^1.2.58",
+    "@budibase/client": "^1.2.58",
+    "@budibase/frontend-core": "^1.2.58",
+    "@budibase/string-templates": "^1.2.58",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
@@ -121,4 +121,4 @@
     "vite": "^2.1.5"
   },
   "gitHead": "115189f72a850bfb52b65ec61d932531bf327072"
-}
+}
\ No newline at end of file
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 86e45021c9..624008a7e0 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.2.58-alpha.7",
+  "version": "1.2.58",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
@@ -48,4 +48,4 @@
     "eslint": "^7.20.0",
     "renamer": "^4.0.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/client/package.json b/packages/client/package.json
index f35d5fd112..cde5efe5db 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.2.58-alpha.7",
+  "version": "1.2.58",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "1.2.58-alpha.7",
-    "@budibase/frontend-core": "1.2.58-alpha.7",
-    "@budibase/string-templates": "1.2.58-alpha.7",
+    "@budibase/bbui": "^1.2.58",
+    "@budibase/frontend-core": "^1.2.58",
+    "@budibase/string-templates": "^1.2.58",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
@@ -58,4 +58,4 @@
     "rollup-plugin-visualizer": "^5.5.4"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
+}
\ No newline at end of file
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 8ee1aa8559..5b816d6d21 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.2.58-alpha.7",
+  "version": "1.2.58",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "1.2.58-alpha.7",
+    "@budibase/bbui": "^1.2.58",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/server/package.json b/packages/server/package.json
index 330cd574c9..04d242f195 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.2.58-alpha.7",
+  "version": "1.2.58",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -77,11 +77,11 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "1.2.58-alpha.7",
-    "@budibase/client": "1.2.58-alpha.7",
-    "@budibase/pro": "1.2.58-alpha.7",
-    "@budibase/string-templates": "1.2.58-alpha.7",
-    "@budibase/types": "1.2.58-alpha.7",
+    "@budibase/backend-core": "^1.2.58",
+    "@budibase/client": "^1.2.58",
+    "@budibase/pro": "1.2.58",
+    "@budibase/string-templates": "^1.2.58",
+    "@budibase/types": "^1.2.58",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
@@ -197,4 +197,4 @@
     "oracledb": "5.3.0"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
+}
\ No newline at end of file
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index aaae2ae12f..72f3c5ff09 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1094,12 +1094,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.58-alpha.7":
-  version "1.2.58-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.58-alpha.7.tgz#b7888eb0e9796a4e49283cf8b928a6771439dbc0"
-  integrity sha512-wdZlJDQtYkGNce9hlj30Np6BDxvS5Mr07XhMwERlKzSRjOOAkQtM5bX+7UVZoIE/X0f8/h47U8P4T3Y98WGMkg==
+"@budibase/backend-core@1.2.58":
+  version "1.2.58"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.58.tgz#00afc311adbfcb8cc2563f77ba7dd1c228d1591f"
+  integrity sha512-kQvs9S7t+p9K/VwEmXkwVqEgz0fqsd0u7794YUhbE69fSso+PiTZlr0tM9mpprLPqJlVm57/4rt8rzoSldRy0g==
   dependencies:
-    "@budibase/types" "1.2.58-alpha.7"
+    "@budibase/types" "^1.2.58"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -1178,13 +1178,13 @@
     svelte-flatpickr "^3.2.3"
     svelte-portal "^1.0.0"
 
-"@budibase/pro@1.2.58-alpha.7":
-  version "1.2.58-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.58-alpha.7.tgz#8b21dbda2081a4362701195365cf5290e8416115"
-  integrity sha512-GDTi6xYpkstSS0CL2kBuNixrVApciovqmx1iC7M5JofGZvbym+Yh4EV+Y9CGAlBw5xgaM3qoGa50AAHB43gtEw==
+"@budibase/pro@1.2.58":
+  version "1.2.58"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.58.tgz#da93611966e95d2a2427bbff3dfe14301b366123"
+  integrity sha512-DAoSjxtSRpgmPS8arFf7tTXyFud5oQH2HwgttS96tDm9/JnZWwKs2vfnj3XX/w8T0SaINvc1abRzjFrryIrTfw==
   dependencies:
-    "@budibase/backend-core" "1.2.58-alpha.7"
-    "@budibase/types" "1.2.58-alpha.7"
+    "@budibase/backend-core" "1.2.58"
+    "@budibase/types" "1.2.58"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
@@ -1207,10 +1207,10 @@
     svelte-apexcharts "^1.0.2"
     svelte-flatpickr "^3.1.0"
 
-"@budibase/types@1.2.58-alpha.7":
-  version "1.2.58-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.58-alpha.7.tgz#5f4e7d262bb597d01a1bd7c0674453946de3cfa2"
-  integrity sha512-VVW7XKFyax5A69cMoR8gwI06cxt/1G1cLH+8ECjIiwb2oO3hHe6WnlA91dUar0IdcdBHji7vYXg4MD1p8wb6jA==
+"@budibase/types@1.2.58", "@budibase/types@^1.2.58":
+  version "1.2.58"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.58.tgz#2f29047f4c11318367516ef63d3c447e4ef28be0"
+  integrity sha512-Em3IrTjK/DO7+CHt17g3XXDQ45KF4+E9b37xdwHIQiXrNKFaDTJXAF9KWFCZD4d6pYgI/+WZCCew/DNOgOUPhA==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 99a2387f2c..214d105912 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.2.58-alpha.7",
+  "version": "1.2.58",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
@@ -46,4 +46,4 @@
     "typescript": "^4.5.5"
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
+}
\ No newline at end of file
diff --git a/packages/types/package.json b/packages/types/package.json
index 2ce235bb09..7805ca3f51 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "1.2.58-alpha.7",
+  "version": "1.2.58",
   "description": "Budibase types",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -17,4 +17,4 @@
     "rimraf": "3.0.2",
     "typescript": "4.7.3"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/worker/package.json b/packages/worker/package.json
index bb85730db0..b24d500f7a 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.2.58-alpha.7",
+  "version": "1.2.58",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -35,10 +35,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "1.2.58-alpha.7",
-    "@budibase/pro": "1.2.58-alpha.7",
-    "@budibase/string-templates": "1.2.58-alpha.7",
-    "@budibase/types": "1.2.58-alpha.7",
+    "@budibase/backend-core": "^1.2.58",
+    "@budibase/pro": "1.2.58",
+    "@budibase/string-templates": "^1.2.58",
+    "@budibase/types": "^1.2.58",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
@@ -104,4 +104,4 @@
     ]
   },
   "gitHead": "d1836a898cab3f8ab80ee6d8f42be1a9eed7dcdc"
-}
+}
\ No newline at end of file
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index ed1335a706..5ad3ab61c3 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -291,12 +291,12 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@1.2.58-alpha.7":
-  version "1.2.58-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.58-alpha.7.tgz#b7888eb0e9796a4e49283cf8b928a6771439dbc0"
-  integrity sha512-wdZlJDQtYkGNce9hlj30Np6BDxvS5Mr07XhMwERlKzSRjOOAkQtM5bX+7UVZoIE/X0f8/h47U8P4T3Y98WGMkg==
+"@budibase/backend-core@1.2.58":
+  version "1.2.58"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-1.2.58.tgz#00afc311adbfcb8cc2563f77ba7dd1c228d1591f"
+  integrity sha512-kQvs9S7t+p9K/VwEmXkwVqEgz0fqsd0u7794YUhbE69fSso+PiTZlr0tM9mpprLPqJlVm57/4rt8rzoSldRy0g==
   dependencies:
-    "@budibase/types" "1.2.58-alpha.7"
+    "@budibase/types" "^1.2.58"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-sdk "2.1030.0"
     bcrypt "5.0.1"
@@ -325,21 +325,21 @@
     uuid "8.3.2"
     zlib "1.0.5"
 
-"@budibase/pro@1.2.58-alpha.7":
-  version "1.2.58-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.58-alpha.7.tgz#8b21dbda2081a4362701195365cf5290e8416115"
-  integrity sha512-GDTi6xYpkstSS0CL2kBuNixrVApciovqmx1iC7M5JofGZvbym+Yh4EV+Y9CGAlBw5xgaM3qoGa50AAHB43gtEw==
+"@budibase/pro@1.2.58":
+  version "1.2.58"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-1.2.58.tgz#da93611966e95d2a2427bbff3dfe14301b366123"
+  integrity sha512-DAoSjxtSRpgmPS8arFf7tTXyFud5oQH2HwgttS96tDm9/JnZWwKs2vfnj3XX/w8T0SaINvc1abRzjFrryIrTfw==
   dependencies:
-    "@budibase/backend-core" "1.2.58-alpha.7"
-    "@budibase/types" "1.2.58-alpha.7"
+    "@budibase/backend-core" "1.2.58"
+    "@budibase/types" "1.2.58"
     "@koa/router" "8.0.8"
     joi "17.6.0"
     node-fetch "^2.6.1"
 
-"@budibase/types@1.2.58-alpha.7":
-  version "1.2.58-alpha.7"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.58-alpha.7.tgz#5f4e7d262bb597d01a1bd7c0674453946de3cfa2"
-  integrity sha512-VVW7XKFyax5A69cMoR8gwI06cxt/1G1cLH+8ECjIiwb2oO3hHe6WnlA91dUar0IdcdBHji7vYXg4MD1p8wb6jA==
+"@budibase/types@1.2.58", "@budibase/types@^1.2.58":
+  version "1.2.58"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-1.2.58.tgz#2f29047f4c11318367516ef63d3c447e4ef28be0"
+  integrity sha512-Em3IrTjK/DO7+CHt17g3XXDQ45KF4+E9b37xdwHIQiXrNKFaDTJXAF9KWFCZD4d6pYgI/+WZCCew/DNOgOUPhA==
 
 "@cspotcode/source-map-consumer@0.8.0":
   version "0.8.0"