diff --git a/bin/schedule b/bin/schedule
index 857ec9f6ff..6300d97edf 100644
--- a/bin/schedule
+++ b/bin/schedule
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ]
 then
     REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 else
diff --git a/bin/worker-audits b/bin/worker-audits
index e411aa386f..8e99481d25 100644
--- a/bin/worker-audits
+++ b/bin/worker-audits
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ]
 then
     REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 else
diff --git a/bin/worker-certificates b/bin/worker-certificates
index 7d474e1ead..9214af513d 100755
--- a/bin/worker-certificates
+++ b/bin/worker-certificates
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ]
 then
     REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 else
diff --git a/bin/worker-deletes b/bin/worker-deletes
index 9c2fb3118e..517f755304 100644
--- a/bin/worker-deletes
+++ b/bin/worker-deletes
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ]
 then
     REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 else
diff --git a/bin/worker-functions b/bin/worker-functions
index b41c019942..29cd4b85cb 100644
--- a/bin/worker-functions
+++ b/bin/worker-functions
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ]
 then
     REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 else
diff --git a/bin/worker-mails b/bin/worker-mails
index 64d10f6099..a663942624 100644
--- a/bin/worker-mails
+++ b/bin/worker-mails
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ]
 then
     REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 else
diff --git a/bin/worker-tasks b/bin/worker-tasks
index fc395b34ab..bac1f54a83 100644
--- a/bin/worker-tasks
+++ b/bin/worker-tasks
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ]
 then
     REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 else
diff --git a/bin/worker-usage b/bin/worker-usage
index 4176f54b86..9cb9b5ed86 100644
--- a/bin/worker-usage
+++ b/bin/worker-usage
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ]
 then
     REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 else
diff --git a/bin/worker-webhooks b/bin/worker-webhooks
index 13029ecbd9..4ae2fadaa9 100644
--- a/bin/worker-webhooks
+++ b/bin/worker-webhooks
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ]
 then
     REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 else
diff --git a/composer.lock b/composer.lock
index 6edc5beac1..24d495dc74 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "15b6e4ddce09e6fb642988603d734aa8",
+    "content-hash": "40de7f78c6b3d14b63c4ec178dcfe1a2",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -364,18 +364,18 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "f38085e434c6a8affe0d4ba8faa5303a0137566d"
+                "reference": "98eeb955cbbe0e5d6f3f818e940c84f66aba427b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f38085e434c6a8affe0d4ba8faa5303a0137566d",
-                "reference": "f38085e434c6a8affe0d4ba8faa5303a0137566d",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/98eeb955cbbe0e5d6f3f818e940c84f66aba427b",
+                "reference": "98eeb955cbbe0e5d6f3f818e940c84f66aba427b",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "guzzlehttp/promises": "^1.4",
-                "guzzlehttp/psr7": "^1.7",
+                "guzzlehttp/psr7": "^1.7 || ^2.0",
                 "php": "^7.2.5 || ^8.0",
                 "psr/http-client": "^1.0"
             },
@@ -460,7 +460,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-03-21T12:52:42+00:00"
+            "time": "2021-03-21T18:42:29+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -520,46 +520,47 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.x-dev",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "72dde17f3154ea87cadea0b71e37493058d970ce"
+                "reference": "c0dcda9f54d145bd4d062a6d15f54931a67732f9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/72dde17f3154ea87cadea0b71e37493058d970ce",
-                "reference": "72dde17f3154ea87cadea0b71e37493058d970ce",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/c0dcda9f54d145bd4d062a6d15f54931a67732f9",
+                "reference": "c0dcda9f54d145bd4d062a6d15f54931a67732f9",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0",
-                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0",
+                "ralouphie/getallheaders": "^3.0"
             },
             "provide": {
+                "psr/http-factory-implementation": "1.0",
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "ext-zlib": "*",
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
+                "bamarni/composer-bin-plugin": "^1.4.1",
+                "http-interop/http-factory-tests": "^0.9",
+                "phpunit/phpunit": "^8.5.8 || ^9.3.10"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
             },
+            "default-branch": true,
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "GuzzleHttp\\Psr7\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -574,6 +575,11 @@
                 {
                     "name": "Tobias Schultze",
                     "homepage": "https://github.com/Tobion"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://sagikazarmark.hu"
                 }
             ],
             "description": "PSR-7 message implementation that also provides common utility methods",
@@ -589,9 +595,9 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.x"
+                "source": "https://github.com/guzzle/psr7/tree/2.0.0-beta1"
             },
-            "time": "2021-03-21T13:41:49+00:00"
+            "time": "2021-03-21T17:21:36+00:00"
         },
         {
             "name": "influxdb/influxdb-php",
@@ -907,6 +913,62 @@
             },
             "time": "2020-09-19T09:12:31+00:00"
         },
+        {
+            "name": "psr/http-factory",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "36fa03d50ff82abcae81860bdaf4ed9a1510c7cd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/36fa03d50ff82abcae81860bdaf4ed9a1510c7cd",
+                "reference": "36fa03d50ff82abcae81860bdaf4ed9a1510c7cd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "psr/http-message": "^1.0"
+            },
+            "default-branch": true,
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory/tree/master"
+            },
+            "time": "2020-09-17T16:52:55+00:00"
+        },
         {
             "name": "psr/http-message",
             "version": "dev-master",
@@ -1644,16 +1706,16 @@
         },
         {
             "name": "utopia-php/framework",
-            "version": "0.12.1",
+            "version": "0.12.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/framework.git",
-                "reference": "ba17789a16527d24b4fb11ddc359901a295fbf2f"
+                "reference": "78be43a0eb711f3677769dfb445e5111bfafaa88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/framework/zipball/ba17789a16527d24b4fb11ddc359901a295fbf2f",
-                "reference": "ba17789a16527d24b4fb11ddc359901a295fbf2f",
+                "url": "https://api.github.com/repos/utopia-php/framework/zipball/78be43a0eb711f3677769dfb445e5111bfafaa88",
+                "reference": "78be43a0eb711f3677769dfb445e5111bfafaa88",
                 "shasum": ""
             },
             "require": {
@@ -1687,9 +1749,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/framework/issues",
-                "source": "https://github.com/utopia-php/framework/tree/0.12.1"
+                "source": "https://github.com/utopia-php/framework/tree/0.12.3"
             },
-            "time": "2021-03-17T22:14:05+00:00"
+            "time": "2021-03-22T22:02:23+00:00"
         },
         {
             "name": "utopia-php/image",
@@ -1954,16 +2016,16 @@
         },
         {
             "name": "utopia-php/swoole",
-            "version": "0.2.2",
+            "version": "0.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/swoole.git",
-                "reference": "17510e90499e73273245c534a05bca522d4ffb37"
+                "reference": "45c42aae7e7d3f9f82bf194c2cfa5499b674aefe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/swoole/zipball/17510e90499e73273245c534a05bca522d4ffb37",
-                "reference": "17510e90499e73273245c534a05bca522d4ffb37",
+                "url": "https://api.github.com/repos/utopia-php/swoole/zipball/45c42aae7e7d3f9f82bf194c2cfa5499b674aefe",
+                "reference": "45c42aae7e7d3f9f82bf194c2cfa5499b674aefe",
                 "shasum": ""
             },
             "require": {
@@ -2004,9 +2066,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/swoole/issues",
-                "source": "https://github.com/utopia-php/swoole/tree/0.2.2"
+                "source": "https://github.com/utopia-php/swoole/tree/0.2.3"
             },
-            "time": "2021-03-17T22:51:07+00:00"
+            "time": "2021-03-22T22:39:24+00:00"
         },
         {
             "name": "utopia-php/system",
@@ -5727,12 +5789,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "37e48403c21e06f63bc27d7ccd997fbb72b0ae2a"
+                "reference": "116bfb0bc9ec2a39db93431b7fe67144164d251e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/37e48403c21e06f63bc27d7ccd997fbb72b0ae2a",
-                "reference": "37e48403c21e06f63bc27d7ccd997fbb72b0ae2a",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/116bfb0bc9ec2a39db93431b7fe67144164d251e",
+                "reference": "116bfb0bc9ec2a39db93431b7fe67144164d251e",
                 "shasum": ""
             },
             "require": {
@@ -5798,7 +5860,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-10T10:07:14+00:00"
+            "time": "2021-03-22T08:23:49+00:00"
         },
         {
             "name": "vimeo/psalm",