diff --git a/.github/workflows/deploy-preprod.yml b/.github/workflows/deploy-preprod.yml
new file mode 100644
index 0000000000..1bf7afbeb9
--- /dev/null
+++ b/.github/workflows/deploy-preprod.yml
@@ -0,0 +1,56 @@
+name: "deploy-preprod"
+on:
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  deploy-to-legacy-preprod-env:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: 'Get Previous tag'
+        id: previoustag
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-1
+
+      - name: Pull values.yaml from budibase-infra
+        run: |
+          curl -H "Authorization: token ${{ secrets.GH_PERSONAL_TOKEN }}" \
+          -H 'Accept: application/vnd.github.v3.raw' \
+          -o values.preprod.yaml \
+          -L https://api.github.com/repos/budibase/budibase-infra/contents/kubernetes/budibase-preprod/values.yaml
+          wc -l values.preprod.yaml
+
+      - name: Deploy to Preprod Environment
+        uses: budibase/helm@v1.8.0
+        with:
+          release: budibase-preprod
+          namespace: budibase
+          chart: charts/budibase
+          token: ${{ github.token }}
+          helm: helm3
+          values: |
+            globals: 
+              appVersion: ${{ steps.previoustag.outputs.tag }}
+            ingress:
+              enabled: true
+              nginx: true
+          value-files: >-
+            [
+              "values.preprod.yaml"
+            ]
+        env:
+          KUBECONFIG_FILE: '${{ secrets.PREPROD_KUBECONFIG }}'
+
+      - name: Discord Webhook Action
+        uses: tsickert/discord-webhook@v4.0.0
+        with:
+          webhook-url: ${{ secrets.PROD_DEPLOY_WEBHOOK_URL }}
+          content: "Preprod Deployment Complete: ${{ steps.previoustag.outputs.tag }} deployed to Budibase Pre-prod."
+          embed-title: ${{ steps.previoustag.outputs.tag }}
\ No newline at end of file
diff --git a/.github/workflows/release-master.yml b/.github/workflows/release-master.yml
index 7d113a3719..3ae265fa21 100644
--- a/.github/workflows/release-master.yml
+++ b/.github/workflows/release-master.yml
@@ -119,6 +119,10 @@ jobs:
         env:
           RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
 
+  deploy-to-legacy-preprod-env:
+    needs: [release-images]
+    uses: ./.github/workflows/deploy-preprod.yml
+    secrets: inherit
 
   # Trigger deploy to new EKS preprod environment
   trigger-deploy-to-preprod-env:
diff --git a/lerna.json b/lerna.json
index 463d894889..f2a0fd957e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.4.8",
+  "version": "2.4.11",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 4986d12978..011fb86184 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,7 +24,7 @@
   "dependencies": {
     "@budibase/nano": "10.1.2",
     "@budibase/pouchdb-replication-stream": "1.2.10",
-    "@budibase/types": "^2.4.8",
+    "@budibase/types": "^2.4.11",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 39cacfdb22..294b125964 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": "2.4.8",
+  "version": "2.4.11",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,8 +38,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "2.4.8",
-    "@budibase/string-templates": "2.4.8",
+    "@budibase/shared-core": "2.4.11",
+    "@budibase/string-templates": "2.4.11",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index c28e6ab2c9..813f163bad 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,11 +58,11 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.8",
-    "@budibase/client": "2.4.8",
-    "@budibase/frontend-core": "2.4.8",
-    "@budibase/shared-core": "2.4.8",
-    "@budibase/string-templates": "2.4.8",
+    "@budibase/bbui": "2.4.11",
+    "@budibase/client": "2.4.11",
+    "@budibase/frontend-core": "2.4.11",
+    "@budibase/shared-core": "2.4.11",
+    "@budibase/string-templates": "2.4.11",
     "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^6.2.1",
     "@fortawesome/free-solid-svg-icons": "^6.2.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 96d600bf24..cc5cbcb577 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "dist/index.js",
   "bin": {
@@ -29,9 +29,9 @@
     "outputPath": "build"
   },
   "dependencies": {
-    "@budibase/backend-core": "^2.4.8",
-    "@budibase/string-templates": "^2.4.8",
-    "@budibase/types": "^2.4.8",
+    "@budibase/backend-core": "^2.4.11",
+    "@budibase/string-templates": "^2.4.11",
+    "@budibase/types": "^2.4.11",
     "axios": "0.21.2",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
diff --git a/packages/client/package.json b/packages/client/package.json
index f114ff3fa5..bf4ae3a69c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,11 +19,11 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "2.4.8",
-    "@budibase/frontend-core": "2.4.8",
-    "@budibase/shared-core": "2.4.8",
-    "@budibase/string-templates": "2.4.8",
-    "@budibase/types": "2.4.8",
+    "@budibase/bbui": "2.4.11",
+    "@budibase/frontend-core": "2.4.11",
+    "@budibase/shared-core": "2.4.11",
+    "@budibase/string-templates": "2.4.11",
+    "@budibase/types": "2.4.11",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 2d3ecbfdd6..a419044d55 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "2.4.8",
-    "@budibase/shared-core": "2.4.8",
+    "@budibase/bbui": "2.4.11",
+    "@budibase/shared-core": "2.4.11",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 972af74500..ad087ea6f5 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 718a311b84..151bb893c9 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -43,12 +43,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "2.4.8",
-    "@budibase/client": "2.4.8",
-    "@budibase/pro": "2.4.8",
-    "@budibase/shared-core": "2.4.8",
-    "@budibase/string-templates": "2.4.8",
-    "@budibase/types": "2.4.8",
+    "@budibase/backend-core": "2.4.11",
+    "@budibase/client": "2.4.11",
+    "@budibase/pro": "2.4.11",
+    "@budibase/shared-core": "2.4.11",
+    "@budibase/string-templates": "2.4.11",
+    "@budibase/types": "2.4.11",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/server/yarn.lock b/packages/server/yarn.lock
index 6fa40b890d..bb42d58f8a 100644
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
@@ -1278,14 +1278,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.8":
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.8.tgz#914d4c591a0f315c6d6efeac9b16e2725fa8b7c9"
-  integrity sha512-SikVhgj4MSWNtET5G9r2BUkazP+mQxoTB+2EoBVra/rst/PYK1QA8U0CkpqPz4dII4/Wf1r7JoSlyFNTknK9ag==
+"@budibase/backend-core@2.4.11":
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.11.tgz#df8a5667ffd8d51157559c4883e6e11aa21d18a4"
+  integrity sha512-f9Fojnsvp9e/LneTxj4p5zPb5XAlh5UhizhgZHAo5oBQJgpeTVaPDRBm9jEvBNG1k/kRi1wpkiwiU6Jxrmbw/A==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.8"
+    "@budibase/types" "^2.4.11"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -1417,14 +1417,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.8":
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.8.tgz#57e3eacde4d68b4e4a6dc3ca8ad44ce63f99bd46"
-  integrity sha512-JaRdy6DTpECzOY1fir0qrtKn1cw7uYYvS40Dd+IgNULsVpTf1CekOEFggRJGlI+v2gwjN8yCyTeW+ZBfF7GNwQ==
+"@budibase/pro@2.4.11":
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.11.tgz#6b554b68f4641d972b96f4677e6ede635a401f8a"
+  integrity sha512-RWzPSg+8S8nqJ/DCtgsRf/h+V8ARAjnCpllsYD/1pfzupLbsr2PE3DDBsNkFY8nUPxk00NMa7aZ0kK4/UiCpFg==
   dependencies:
-    "@budibase/backend-core" "2.4.8"
+    "@budibase/backend-core" "2.4.11"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.8"
+    "@budibase/types" "2.4.11"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -1463,10 +1463,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.8", "@budibase/types@^2.4.8":
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.8.tgz#0020f6afb0627e295f14233ac287c68d23a7ca14"
-  integrity sha512-tn4jznyWBHNRGlwRUrln7U1Z0R19BSOgGhLXj1UtNOWT8k2xxNmXaP/JWynwrpLkZFuHIZfOV/YIaVL+SyxjFA==
+"@budibase/types@2.4.11", "@budibase/types@^2.4.11":
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.11.tgz#6f4793403fbe02f122fb59b488b54255ceaf0104"
+  integrity sha512-16PQ7EHVZx+6HlFjr4+RaEjkCXWVNLpSaVH1GuYDko5i+LTQ3aPt3l9u31XoFRZwGDSCMJk97wVuSMrh1zg1Og==
 
 "@bull-board/api@3.7.0":
   version "3.7.0"
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index 096eddc697..28c55a2574 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 63d083f169..dd7c49914b 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/types/package.json b/packages/types/package.json
index b305eb905b..8c50ffe8af 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "description": "Budibase types",
   "main": "dist/cjs/index.js",
   "types": "dist/mjs/index.d.ts",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 777726a189..7b6633ba48 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.4.8",
+  "version": "2.4.11",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -36,10 +36,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.4.8",
-    "@budibase/pro": "2.4.8",
-    "@budibase/string-templates": "^2.4.8",
-    "@budibase/types": "^2.4.8",
+    "@budibase/backend-core": "^2.4.11",
+    "@budibase/pro": "2.4.11",
+    "@budibase/string-templates": "^2.4.11",
+    "@budibase/types": "^2.4.11",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
diff --git a/packages/worker/yarn.lock b/packages/worker/yarn.lock
index 01d44c3c69..35111428ce 100644
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
@@ -475,14 +475,14 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.4.8":
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.8.tgz#914d4c591a0f315c6d6efeac9b16e2725fa8b7c9"
-  integrity sha512-SikVhgj4MSWNtET5G9r2BUkazP+mQxoTB+2EoBVra/rst/PYK1QA8U0CkpqPz4dII4/Wf1r7JoSlyFNTknK9ag==
+"@budibase/backend-core@2.4.11":
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.4.11.tgz#df8a5667ffd8d51157559c4883e6e11aa21d18a4"
+  integrity sha512-f9Fojnsvp9e/LneTxj4p5zPb5XAlh5UhizhgZHAo5oBQJgpeTVaPDRBm9jEvBNG1k/kRi1wpkiwiU6Jxrmbw/A==
   dependencies:
     "@budibase/nano" "10.1.2"
     "@budibase/pouchdb-replication-stream" "1.2.10"
-    "@budibase/types" "^2.4.8"
+    "@budibase/types" "^2.4.11"
     "@shopify/jest-koa-mocks" "5.0.1"
     "@techpass/passport-openidconnect" "0.3.2"
     aws-cloudfront-sign "2.2.0"
@@ -564,14 +564,14 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.4.8":
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.8.tgz#57e3eacde4d68b4e4a6dc3ca8ad44ce63f99bd46"
-  integrity sha512-JaRdy6DTpECzOY1fir0qrtKn1cw7uYYvS40Dd+IgNULsVpTf1CekOEFggRJGlI+v2gwjN8yCyTeW+ZBfF7GNwQ==
+"@budibase/pro@2.4.11":
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.4.11.tgz#6b554b68f4641d972b96f4677e6ede635a401f8a"
+  integrity sha512-RWzPSg+8S8nqJ/DCtgsRf/h+V8ARAjnCpllsYD/1pfzupLbsr2PE3DDBsNkFY8nUPxk00NMa7aZ0kK4/UiCpFg==
   dependencies:
-    "@budibase/backend-core" "2.4.8"
+    "@budibase/backend-core" "2.4.11"
     "@budibase/string-templates" "2.3.20"
-    "@budibase/types" "2.4.8"
+    "@budibase/types" "2.4.11"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"
@@ -592,10 +592,10 @@
     lodash "^4.17.20"
     vm2 "^3.9.4"
 
-"@budibase/types@2.4.8", "@budibase/types@^2.4.8":
-  version "2.4.8"
-  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.8.tgz#0020f6afb0627e295f14233ac287c68d23a7ca14"
-  integrity sha512-tn4jznyWBHNRGlwRUrln7U1Z0R19BSOgGhLXj1UtNOWT8k2xxNmXaP/JWynwrpLkZFuHIZfOV/YIaVL+SyxjFA==
+"@budibase/types@2.4.11", "@budibase/types@^2.4.11":
+  version "2.4.11"
+  resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.4.11.tgz#6f4793403fbe02f122fb59b488b54255ceaf0104"
+  integrity sha512-16PQ7EHVZx+6HlFjr4+RaEjkCXWVNLpSaVH1GuYDko5i+LTQ3aPt3l9u31XoFRZwGDSCMJk97wVuSMrh1zg1Og==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"