diff --git a/.drone.star b/.drone.star
index 8de24ed03f..298687a244 100644
--- a/.drone.star
+++ b/.drone.star
@@ -156,17 +156,18 @@ def main(ctx):
     test_pipelines = \
         cancelPreviousBuilds() + \
         [buildOcisBinaryForTesting(ctx)] + \
+        testOcisModules(ctx) + \
         testPipelines(ctx)
 
-    # build_release_pipelines = \
-    #     dockerReleases(ctx) + \
-    #     binaryReleases(ctx) + \
-    #     [releaseSubmodule(ctx)]
+    build_release_pipelines = \
+        dockerReleases(ctx) + \
+        binaryReleases(ctx) + \
+        [releaseSubmodule(ctx)]
 
-    # build_release_helpers = [
-    #     changelog(ctx),
-    #     docs(ctx),
-    # ]
+    build_release_helpers = [
+        changelog(ctx),
+        docs(ctx),
+    ]
 
     test_pipelines.append(
         pipelineDependsOn(
@@ -175,7 +176,7 @@ def main(ctx):
         ),
     )
 
-    pipelines = test_pipelines  # + build_release_pipelines + build_release_helpers
+    pipelines = test_pipelines + build_release_pipelines + build_release_helpers
 
     pipelines = \
         pipelines + \
@@ -235,21 +236,21 @@ def testPipelines(ctx):
     if "skip" not in config["localApiTests"] or not config["localApiTests"]["skip"]:
         pipelines = [
             localApiTests(ctx, "ocis", "apiAccountsHashDifficulty", "default"),
-            # localApiTests(ctx, "ocis", "apiSpaces", "default"),
-            # localApiTests(ctx, "ocis", "apiArchiver", "default"),
+            localApiTests(ctx, "ocis", "apiSpaces", "default"),
+            localApiTests(ctx, "ocis", "apiArchiver", "default"),
         ]
 
-    # if "skip" not in config["apiTests"] or not config["apiTests"]["skip"]:
-    #     pipelines += apiTests(ctx)
+    if "skip" not in config["apiTests"] or not config["apiTests"]["skip"]:
+        pipelines += apiTests(ctx)
 
-    # if "skip" not in config["uiTests"] or not config["uiTests"]["skip"]:
-    #     pipelines += uiTests(ctx)
+    if "skip" not in config["uiTests"] or not config["uiTests"]["skip"]:
+        pipelines += uiTests(ctx)
 
-    # if "skip" not in config["accountsUITests"] or not config["accountsUITests"]["skip"]:
-    #     pipelines.append(accountsUITests(ctx))
+    if "skip" not in config["accountsUITests"] or not config["accountsUITests"]["skip"]:
+        pipelines.append(accountsUITests(ctx))
 
-    # if "skip" not in config["settingsUITests"] or not config["settingsUITests"]["skip"]:
-    #     pipelines.append(settingsUITests(ctx))
+    if "skip" not in config["settingsUITests"] or not config["settingsUITests"]["skip"]:
+        pipelines.append(settingsUITests(ctx))
 
     if "skip" not in config["parallelApiTests"] or not config["parallelApiTests"]["skip"]:
         pipelines += parallelDeployAcceptancePipeline(ctx)
@@ -1509,7 +1510,6 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
                 "apk add mailcap",  # install /etc/mime.types
                 "ocis/bin/ocis server",
             ],
-            "user": "33:33",
             "volumes": volumes,
             "depends_on": depends_on,
         },
@@ -1519,6 +1519,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
             "commands": [
                 "wait-for -it ocis-server:9200 -t 300",
             ],
+            "depends_on": depends_on,
         },
     ]
 
@@ -2047,10 +2048,11 @@ def parallelDeployAcceptancePipeline(ctx):
                     "os": "linux",
                     "arch": "amd64",
                 },
-                "steps": cloneCoreRepos() +
+                "steps": skipIfUnchanged(ctx, "acceptance-tests") +
+                         restoreBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin/ocis") +
+                         cloneCoreRepos() +
                          copyConfigs() +
-                         waitForServices() +
-                         oC10Server() +
+                         parallelDeploymentOC10Server() +
                          owncloudLog() +
                          fixSharedDataPermissions() +
                          ocisServer(
@@ -2073,6 +2075,7 @@ def parallelDeployAcceptancePipeline(ctx):
                     pipeOCISConfigVol,
                     pipelineVolumeOC10Tests,
                 ],
+                "depends_on": getPipelineNames([buildOcisBinaryForTesting(ctx)]),
                 "trigger": {},
             }
 
@@ -2117,7 +2120,7 @@ def parallelAcceptance(env):
         "commands": [
             "make test-paralleldeployment-api",
         ],
-        "depends_on": ["clone-core-repos", "wait-for-oc10", "wait-for-ocis"],
+        "depends_on": ["clone-core-repos", "wait-for-oc10", "wait-for-ocis-server"],
         "volumes": [
             stepVolumeOC10Apps,
             stepVolumeOC10Tests,
@@ -2125,7 +2128,7 @@ def parallelAcceptance(env):
         ],
     }]
 
-def latestOcisServer():
+def parallelDeploymentOcisServer():
     environment = {
         # Keycloak IDP specific configuration
         "PROXY_OIDC_ISSUER": "https://keycloak/auth/realmsowncloud",
@@ -2220,7 +2223,7 @@ def latestOcisServer():
         },
     ]
 
-def oC10Server():
+def parallelDeploymentOC10Server():
     return [
         {
             "name": "oc10",
@@ -2278,7 +2281,7 @@ def oC10Server():
                 stepVolumeOC10Templates,
                 stepVolumeOC10PreServer,
             ],
-            "depends_on": ["wait-for-services", "copy-configs"],
+            "depends_on": ["copy-configs"],
         },
         {
             "name": "wait-for-oc10",
@@ -2286,7 +2289,7 @@ def oC10Server():
             "commands": [
                 "wait-for -it oc10:8080 -t 300",
             ],
-            "depends_on": ["wait-for-services"],
+            "depends_on": ["copy-configs"],
         },
     ]
 
@@ -2385,13 +2388,3 @@ def fixSharedDataPermissions():
         ],
         "depends_on": ["wait-for-oc10"],
     }]
-
-def waitForServices():
-    return [{
-        "name": "wait-for-services",
-        "image": OC_CI_WAIT_FOR,
-        "commands": [
-            "wait-for -it oc10-db:3306 -t 300",
-            "wait-for -it openldap:636 -t 300",
-        ],
-    }]