diff --git a/CHANGES b/CHANGES
index bcf162f9d..90802378b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2663,5 +2663,5 @@
 * translation: fix crash when translated text has single quote (french)
 * dyndns: show logs
 * mail: server location get it's own section
-* turn: make it an optional service
+* optional services: redis & turn . joins sendmail, recvmail
 
diff --git a/dashboard/src/translation/en.json b/dashboard/src/translation/en.json
index c80444a86..f277200fb 100644
--- a/dashboard/src/translation/en.json
+++ b/dashboard/src/translation/en.json
@@ -90,7 +90,8 @@
         "statusEnabled": "Enabled",
         "statusDisabled": "Disabled",
         "loadingPlaceholder": "Loading",
-        "settings": "Settings"
+        "settings": "Settings",
+        "saveAction": "Save"
     },
     "appstore": {
         "title": "App Store",
@@ -1721,6 +1722,17 @@
             "label": "Label",
             "clearIconAction": "Clear Icon",
             "clearIconDescription": "This will try to fetch the app's favicon on save."
+        },
+        "servicesTabTitle": "Services",
+        "turn": {
+            "title": "TURN Setup",
+            "enable": "Configure the app to use the built-in TURN server",
+            "disable": "Do not configure the app's TURN settings. The app's TURN settings is left alone. You can configure it inside the app."
+        },
+        "redis": {
+            "title": "Redis Configuration",
+            "enable": "Configure the app to use Redis",
+            "disable": "Disable Redis"
         }
     },
     "login": {
diff --git a/dashboard/src/views/app.html b/dashboard/src/views/app.html
index 493029991..152f1ed83 100644
--- a/dashboard/src/views/app.html
+++ b/dashboard/src/views/app.html
@@ -632,7 +632,7 @@
         <div ng-click="setView('proxy')" ng-class="{ 'active': view === 'proxy' }" ng-show="app.type === APP_TYPES.PROXIED">Proxy</div>
         <div ng-click="setView('access')" ng-class="{ 'active': view === 'access' }" ng-show="app.accessLevel === 'admin'">{{ 'app.accessControlTabTitle' | tr }}</div>
         <div ng-click="setView('resources')" ng-class="{ 'active': view === 'resources' }" ng-show="app.type !== APP_TYPES.PROXIED">{{ 'app.resourcesTabTitle' | tr }}</div>
-        <div ng-click="setView('services')" ng-class="{ 'active': view === 'services' }" ng-show="app.type !== APP_TYPES.PROXIED && app.manifest.addons.turn.optional">{{ 'app.servicesTabTitle' | tr }}</div>
+        <div ng-click="setView('services')" ng-class="{ 'active': view === 'services' }" ng-show="app.type !== APP_TYPES.PROXIED && (app.manifest.addons.turn.optional || app.manifest.addons.redis.optional)">{{ 'app.servicesTabTitle' | tr }}</div>
         <div ng-click="setView('storage')" ng-class="{ 'active': view === 'storage' }" ng-show="app.accessLevel === 'admin' && app.type !== APP_TYPES.PROXIED">{{ 'app.storageTabTitle' | tr }}</div>
         <div ng-click="setView('graphs')" ng-class="{ 'active': view === 'graphs' }" ng-show="app.type !== APP_TYPES.PROXIED">{{ 'app.graphsTabTitle' | tr }}</div>
         <div ng-click="setView('security')" ng-class="{ 'active': view === 'security' }">{{ 'app.securityTabTitle' | tr }}</div>
@@ -966,20 +966,20 @@
         </div>
       </div>
 
-      <div class="card" ng-show="view === 'services' && app.manifest.addons.turn.optional">
+      <div class="card" ng-show="view === 'services'">
         <div class="row" ng-show="app.manifest.addons.turn.optional">
           <div class="col-md-12">
             <label class="control-label">{{ 'app.turn.title' | tr }} <sup><a ng-href="https://docs.cloudron.io/apps/#turn" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
 
             <div class="radio">
               <label>
-                <input type="radio" ng-model="services.enableTurn" value="0"> {{ 'app.turn.disable' | tr }}
+                <input type="radio" ng-model="services.enableTurn" value="1"> {{ 'app.turn.enable' | tr }}
               </label>
             </div>
 
             <div class="radio">
               <label>
-                <input type="radio" ng-model="services.enableTurn" value="1"> {{ 'app.turn.enable' | tr }}
+                <input type="radio" ng-model="services.enableTurn" value="0"> {{ 'app.turn.disable' | tr }}
               </label>
             </div>
           </div>
@@ -987,10 +987,38 @@
           <div class="col-md-12 text-right">
             <br/>
             <button class="btn btn-outline btn-primary pull-right" ng-click="services.submitTurn()" ng-disabled="app.enableTurn === services.enableTurn || services.busy || app.error || app.taskId" tooltip-enable="app.error || app.taskId" uib-tooltip="{{ app.error ? 'App is in error state' : 'App is busy' }}">
-              <i class="fa fa-circle-notch fa-spin" ng-show="services.busy"></i> {{ 'app.turn.saveAction' | tr }}
+              <i class="fa fa-circle-notch fa-spin" ng-show="services.busy"></i> {{ 'main.saveAction' | tr }}
             </button>
           </div>
         </div>
+
+        <hr ng-show="app.manifest.addons.turn.optional && app.manifest.addons.redis.optional">
+
+        <div class="row" ng-show="app.manifest.addons.redis.optional">
+          <div class="col-md-12">
+            <label class="control-label">{{ 'app.redis.title' | tr }} <sup><a ng-href="https://docs.cloudron.io/apps/#redis" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup></label>
+
+            <div class="radio">
+              <label>
+                <input type="radio" ng-model="services.enableRedis" value="1"> {{ 'app.redis.enable' | tr }}
+              </label>
+            </div>
+
+            <div class="radio">
+              <label>
+                <input type="radio" ng-model="services.enableRedis" value="0"> {{ 'app.redis.disable' | tr }}
+              </label>
+            </div>
+          </div>
+
+          <div class="col-md-12 text-right">
+            <br/>
+            <button class="btn btn-outline btn-primary pull-right" ng-click="services.submitRedis()" ng-disabled="app.enablRedis === services.enableRedis || services.busy || app.error || app.taskId" tooltip-enable="app.error || app.taskId" uib-tooltip="{{ app.error ? 'App is in error state' : 'App is busy' }}">
+              <i class="fa fa-circle-notch fa-spin" ng-show="services.busy"></i> {{ 'main.saveAction' | tr }}
+            </button>
+          </div>
+        </div>
+
       </div>
 
       <div class="card" ng-show="view === 'storage'">
diff --git a/dashboard/src/views/app.js b/dashboard/src/views/app.js
index a918c4fb6..ee88251d8 100644
--- a/dashboard/src/views/app.js
+++ b/dashboard/src/views/app.js
@@ -590,12 +590,14 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
         busy: false,
         enableTurn: '1', // curse of radio buttons
+        enableRedis: '1',
 
         show: function () {
             var app = $scope.app;
 
             $scope.services.error = {};
             $scope.services.enableTurn = app.enableTurn ? '1' : '0';
+            $scope.services.enableRedis = app.enableRedis ? '1' : '0';
         },
 
         submitTurn: function () {
@@ -613,6 +615,22 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
                 $timeout(function () { $scope.services.busy = false; }, 1000);
             });
         },
+
+        submitRedis: function () {
+            $scope.services.busy = true;
+            $scope.services.error = {};
+
+            Client.configureApp($scope.app.id, 'redis', { enable: $scope.services.enableRedis === '1' }, function (error) {
+                if (error && error.statusCode === 400) {
+                    $scope.services.busy = false;
+                    $scope.services.error.redis = true;
+                    return;
+                }
+                if (error) return Client.error(error);
+
+                $timeout(function () { $scope.services.busy = false; }, 1000);
+            });
+        },
     };
 
     $scope.storage = {
diff --git a/src/services.js b/src/services.js
index 52eb9a0e3..ddd61fe95 100644
--- a/src/services.js
+++ b/src/services.js
@@ -1812,6 +1812,9 @@ async function backupRedis(app, options) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof options, 'object');
 
+    const disabled = app.manifest.addons.redis.optional && !app.enableRedis;
+    if (disabled) return;
+
     debug('Backing up redis');
 
     const result = await getContainerDetails('redis-' + app.id, 'CLOUDRON_REDIS_TOKEN');
@@ -1822,6 +1825,9 @@ async function restoreRedis(app, options) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof options, 'object');
 
+    const disabled = app.manifest.addons.redis.optional && !app.enableRedis;
+    if (disabled) return;
+
     debug('Restoring redis');
 
     const result = await getContainerDetails('redis-' + app.id, 'CLOUDRON_REDIS_TOKEN');