diff --git a/.drone.star b/.drone.star
index e29256a..c1b48b5 100644
--- a/.drone.star
+++ b/.drone.star
@@ -45,137 +45,7 @@ config = {
         },
     },
     "acceptance": {
-        "cli-masterkey": {
-            "suites": [
-                "cliEncryption",
-            ],
-            "databases": [
-                "mysql:8.0",
-                "postgres:9.4",
-            ],
-            "servers": [
-                "daily-master-qa",
-                "latest",
-            ],
-            "extraSetup": [
-                {
-                    "name": "configure-app",
-                    "image": "owncloudci/php:7.4",
-                    "pull": "always",
-                    "commands": [
-                        "cd /var/www/owncloud/server",
-                        "php occ encryption:enable",
-                        "php occ encryption:select-encryption-type masterkey --yes",
-                        "php occ config:list",
-                    ],
-                },
-            ],
-        },
-        "api-masterkey": {
-            "suites": {
-                "apiEncryption": "apiMasterKeys",
-            },
-            "databases": [
-                "mysql:8.0",
-                "postgres:9.4",
-            ],
-            "servers": [
-                "daily-master-qa",
-                "latest",
-            ],
-            "extraSetup": [
-                {
-                    "name": "configure-app",
-                    "image": "owncloudci/php:7.4",
-                    "pull": "always",
-                    "commands": [
-                        "cd /var/www/owncloud/server",
-                        "php occ encryption:enable",
-                        "php occ encryption:select-encryption-type masterkey --yes",
-                        "php occ config:list",
-                    ],
-                },
-            ],
-        },
-        "webUI-masterkey": {
-            "suites": {
-                "webUIMasterKeyType": "webUIMasterKey",
-            },
-            "databases": [
-                "mysql:8.0",
-            ],
-            "servers": [
-                "daily-master-qa",
-                "latest",
-            ],
-            "emailNeeded": True,
-            "extraSetup": [
-                {
-                    "name": "configure-app",
-                    "image": "owncloudci/php:7.4",
-                    "pull": "always",
-                    "commands": [
-                        "cd /var/www/owncloud/server",
-                        "php occ encryption:enable",
-                        "php occ encryption:select-encryption-type masterkey --yes",
-                        "php occ config:list",
-                    ],
-                },
-            ],
-        },
-        "api-userkeys": {
-            "suites": {
-                "apiEncryption": "apiUserKeys",
-            },
-            "databases": [
-                "mysql:8.0",
-                "postgres:9.4",
-            ],
-            "servers": [
-                "daily-master-qa",
-                "latest",
-            ],
-            "extraSetup": [
-                {
-                    "name": "configure-app",
-                    "image": "owncloudci/php:7.4",
-                    "pull": "always",
-                    "commands": [
-                        "cd /var/www/owncloud/server",
-                        "php occ encryption:enable",
-                        "php occ encryption:select-encryption-type user-keys --yes",
-                        "php occ config:list",
-                    ],
-                },
-            ],
-        },
-        "webUI-userkeys": {
-            "suites": {
-                "webUIUserKeysType": "webUIUserKeys",
-            },
-            "databases": [
-                "mysql:8.0",
-            ],
-            "servers": [
-                "daily-master-qa",
-                "latest",
-            ],
-            "emailNeeded": True,
-            "extraSetup": [
-                {
-                    "name": "configure-app",
-                    "image": "owncloudci/php:7.4",
-                    "pull": "always",
-                    "commands": [
-                        "cd /var/www/owncloud/server",
-                        "php occ encryption:enable",
-                        "php occ encryption:select-encryption-type user-keys --yes",
-                        "php occ config:list",
-                    ],
-                },
-            ],
-        },
-        "api-core-masterkey": {
+        "api-core-user-keys": {
             "suites": [
                 "apiCoreMKey",
             ],
@@ -191,7 +61,7 @@ config = {
             "emailNeeded": True,
             "federatedServerNeeded": True,
             "extraEnvironment": {
-                "ENCRYPTION_TYPE": "masterkey",
+                "ENCRYPTION_TYPE": "user-keys",
             },
             "extraSetup": [
                 {
@@ -201,13 +71,13 @@ config = {
                     "commands": [
                         "cd /var/www/owncloud/server",
                         "php occ encryption:enable",
-                        "php occ encryption:select-encryption-type masterkey --yes",
+                        "php occ encryption:select-encryption-type user-keys --yes",
                         "php occ config:list",
                     ],
                 },
             ],
         },
-        "api-core-latest-masterkey": {
+        "api-core-latest-user-keys": {
             "suites": [
                 "apiCoreMKey",
             ],
@@ -224,7 +94,7 @@ config = {
             "federatedServerNeeded": True,
             "cron": "nightly",
             "extraEnvironment": {
-                "ENCRYPTION_TYPE": "masterkey",
+                "ENCRYPTION_TYPE": "user-keys",
             },
             "extraSetup": [
                 {
@@ -234,13 +104,13 @@ config = {
                     "commands": [
                         "cd /var/www/owncloud/server",
                         "php occ encryption:enable",
-                        "php occ encryption:select-encryption-type masterkey --yes",
+                        "php occ encryption:select-encryption-type user-keys --yes",
                         "php occ config:list",
                     ],
                 },
             ],
         },
-        "cli-core-masterkey": {
+        "cli-core-user-keys": {
             "suites": [
                 "cliCoreMKey",
             ],
@@ -255,7 +125,7 @@ config = {
             "numberOfParts": 7,
             "emailNeeded": True,
             "extraEnvironment": {
-                "ENCRYPTION_TYPE": "masterkey",
+                "ENCRYPTION_TYPE": "user-keys",
             },
             "extraSetup": [
                 {
@@ -265,13 +135,13 @@ config = {
                     "commands": [
                         "cd /var/www/owncloud/server",
                         "php occ encryption:enable",
-                        "php occ encryption:select-encryption-type masterkey --yes",
+                        "php occ encryption:select-encryption-type user-keys --yes",
                         "php occ config:list",
                     ],
                 },
             ],
         },
-        "webUI-core-masterkey": {
+        "webUI-core-user-keys": {
             "suites": [
                 "webUIcoreMKey",
             ],
@@ -288,7 +158,7 @@ config = {
             "federatedServerNeeded": True,
             "selUserNeeded": True,
             "extraEnvironment": {
-                "ENCRYPTION_TYPE": "masterkey",
+                "ENCRYPTION_TYPE": "user-keys",
             },
             "extraSetup": [
                 {
@@ -298,13 +168,13 @@ config = {
                     "commands": [
                         "cd /var/www/owncloud/server",
                         "php occ encryption:enable",
-                        "php occ encryption:select-encryption-type masterkey --yes",
+                        "php occ encryption:select-encryption-type user-keys --yes",
                         "php occ config:list",
                     ],
                 },
             ],
         },
-        "webUI-core-latest-masterkey": {
+        "webUI-core-latest-user-keys": {
             "suites": [
                 "webUIcoreMKey",
             ],
@@ -322,7 +192,7 @@ config = {
             "selUserNeeded": True,
             "cron": "nightly",
             "extraEnvironment": {
-                "ENCRYPTION_TYPE": "masterkey",
+                "ENCRYPTION_TYPE": "user-keys",
             },
             "extraSetup": [
                 {
@@ -332,7 +202,7 @@ config = {
                     "commands": [
                         "cd /var/www/owncloud/server",
                         "php occ encryption:enable",
-                        "php occ encryption:select-encryption-type masterkey --yes",
+                        "php occ encryption:select-encryption-type user-keys --yes",
                         "php occ config:list",
                     ],
                 },