diff --git a/lerna.json b/lerna.json
index ebac370ac8..202e1c6f49 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.6.6",
+  "version": "2.6.8",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*"],
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 6373218402..03dae9feca 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "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.6.6",
+    "@budibase/types": "^2.6.8",
     "@shopify/jest-koa-mocks": "5.0.1",
     "@techpass/passport-openidconnect": "0.3.2",
     "aws-cloudfront-sign": "2.2.0",
diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 155f09e6d9..72cd1a4af0 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -95,7 +95,7 @@ const environment = {
   GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
   SALT_ROUNDS: process.env.SALT_ROUNDS,
   REDIS_URL: process.env.REDIS_URL || "localhost:6379",
-  REDIS_PASSWORD: process.env.REDIS_PASSWORD || "budibase",
+  REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
   MOCK_REDIS: process.env.MOCK_REDIS,
   MINIO_ACCESS_KEY: process.env.MINIO_ACCESS_KEY,
diff --git a/packages/backend-core/src/redis/redlockImpl.ts b/packages/backend-core/src/redis/redlockImpl.ts
index 4e9cd569ed..55b891ea84 100644
--- a/packages/backend-core/src/redis/redlockImpl.ts
+++ b/packages/backend-core/src/redis/redlockImpl.ts
@@ -85,7 +85,7 @@ export const doWithLock = async <T>(
   opts: LockOptions,
   task: () => Promise<T>
 ): Promise<RedlockExecution<T>> => {
-  const redlock = await getClient(opts.type)
+  const redlock = await getClient(opts.type, opts.customOptions)
   let lock
   try {
     // determine lock name
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 9b536c1183..f0fe559705 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.6.6",
+  "version": "2.6.8",
   "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.6.6",
-    "@budibase/string-templates": "^2.6.6",
+    "@budibase/shared-core": "^2.6.8",
+    "@budibase/string-templates": "^2.6.8",
     "@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 442e6482b2..1b69c7aaac 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -58,10 +58,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^2.6.6",
-    "@budibase/frontend-core": "^2.6.6",
-    "@budibase/shared-core": "^2.6.6",
-    "@budibase/string-templates": "^2.6.6",
+    "@budibase/bbui": "^2.6.8",
+    "@budibase/frontend-core": "^2.6.8",
+    "@budibase/shared-core": "^2.6.8",
+    "@budibase/string-templates": "^2.6.8",
     "@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 ddf27a462e..a28c66fe65 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "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.6.6",
-    "@budibase/string-templates": "^2.6.6",
-    "@budibase/types": "^2.6.6",
+    "@budibase/backend-core": "^2.6.8",
+    "@budibase/string-templates": "^2.6.8",
+    "@budibase/types": "^2.6.8",
     "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 515c05174b..46f365de5d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "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.6.6",
-    "@budibase/frontend-core": "^2.6.6",
-    "@budibase/shared-core": "^2.6.6",
-    "@budibase/string-templates": "^2.6.6",
-    "@budibase/types": "^2.6.6",
+    "@budibase/bbui": "^2.6.8",
+    "@budibase/frontend-core": "^2.6.8",
+    "@budibase/shared-core": "^2.6.8",
+    "@budibase/string-templates": "^2.6.8",
+    "@budibase/types": "^2.6.8",
     "@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 d6e7e13300..e701687d10 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^2.6.6",
-    "@budibase/shared-core": "^2.6.6",
+    "@budibase/bbui": "^2.6.8",
+    "@budibase/shared-core": "^2.6.8",
     "dayjs": "^1.11.7",
     "lodash": "^4.17.21",
     "socket.io-client": "^4.6.1",
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 85bc4e4ba2..5b528a145a 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/sdk",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "description": "Budibase Public API SDK",
   "author": "Budibase",
   "license": "MPL-2.0",
diff --git a/packages/server/package.json b/packages/server/package.json
index 4456c99179..7be437535e 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -45,12 +45,12 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "^2.6.6",
-    "@budibase/client": "^2.6.6",
-    "@budibase/pro": "2.6.6",
-    "@budibase/shared-core": "^2.6.6",
-    "@budibase/string-templates": "^2.6.6",
-    "@budibase/types": "^2.6.6",
+    "@budibase/backend-core": "^2.6.8",
+    "@budibase/client": "^2.6.8",
+    "@budibase/pro": "2.6.8",
+    "@budibase/shared-core": "^2.6.8",
+    "@budibase/string-templates": "^2.6.8",
+    "@budibase/types": "^2.6.8",
     "@bull-board/api": "3.7.0",
     "@bull-board/koa": "3.9.4",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts
index bed798f75b..6852778e68 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -42,13 +42,17 @@ if (!env.isTest()) {
         host: REDIS_OPTS.host,
         port: REDIS_OPTS.port,
       },
-      password:
-        REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password,
+    }
+
+    if (REDIS_OPTS.opts?.password || REDIS_OPTS.opts.redisOptions?.password) {
+      // @ts-ignore
+      options.password =
+        REDIS_OPTS.opts.password || REDIS_OPTS.opts.redisOptions.password
     }
 
     if (!env.REDIS_CLUSTERED) {
-      // Can't set direct redis db in clustered env
       // @ts-ignore
+      // Can't set direct redis db in clustered env
       options.database = 1
     }
   }
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index aba3c65793..68d9824126 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/shared-core",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "description": "Shared data utils",
   "main": "dist/cjs/src/index.js",
   "types": "dist/mjs/src/index.d.ts",
@@ -20,7 +20,7 @@
     "dev:builder": "yarn prebuild && concurrently \"tsc -p tsconfig.build.json --watch\" \"tsc -p tsconfig-cjs.build.json --watch\""
   },
   "dependencies": {
-    "@budibase/types": "^2.6.6"
+    "@budibase/types": "^2.6.8"
   },
   "devDependencies": {
     "concurrently": "^7.6.0",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index b3deeae198..105cb98472 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "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 39b5e834de..1e8e46c44d 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/types",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "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 d418a1e304..ebbe5d62bd 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "2.6.6",
+  "version": "2.6.8",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -37,10 +37,10 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^2.6.6",
-    "@budibase/pro": "2.6.6",
-    "@budibase/string-templates": "^2.6.6",
-    "@budibase/types": "^2.6.6",
+    "@budibase/backend-core": "^2.6.8",
+    "@budibase/pro": "2.6.8",
+    "@budibase/string-templates": "^2.6.8",
+    "@budibase/types": "^2.6.8",
     "@koa/router": "8.0.8",
     "@sentry/node": "6.17.7",
     "@techpass/passport-openidconnect": "0.3.2",
diff --git a/yarn.lock b/yarn.lock
index a0cd7741f6..4b2bab4ec2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1486,15 +1486,15 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@budibase/pro@2.6.5":
-  version "2.6.5"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.5.tgz#93cababe9e5f846b85222c9b6b31138baeda76cb"
-  integrity sha512-NHpwFKwTVOQ9xloiidvNgYf41xKYm6TmqJgt8xSO4R7Wbo/lGE4agDFjuivabiaVrnTYHm98heu0t+MFP9uZBg==
+"@budibase/pro@2.6.7":
+  version "2.6.7"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.6.7.tgz#884b33f3a3e3f2e548fd7519d32b40dc98803400"
+  integrity sha512-f7g+0So7hr7tHHEF28cz550imYpq/CqRNzhMQpUwmzgbdTlOdVej3PWPNK9+MuBlNea3J9b2WQsjS9TkGZfTlA==
   dependencies:
-    "@budibase/backend-core" "2.6.5"
+    "@budibase/backend-core" "2.6.7"
     "@budibase/shared-core" "2.5.9"
     "@budibase/string-templates" "2.5.9"
-    "@budibase/types" "2.6.5"
+    "@budibase/types" "2.6.7"
     "@koa/router" "8.0.8"
     bull "4.10.1"
     joi "17.6.0"