diff --git a/.drone.star b/.drone.star
index dbd141f78b7..19157a3dc62 100644
--- a/.drone.star
+++ b/.drone.star
@@ -64,29 +64,32 @@ config = {
         "oCIS-1": {
             "earlyFail": True,
             "skip": False,
-            "featurePaths": [
-                "tests/e2e/cucumber/features/{smoke,journeys}/*.feature",
+            "suites": [
+                "journeys",
+                "smoke",
             ],
         },
         "oCIS-2": {
             "earlyFail": True,
             "skip": False,
-            "featurePaths": [
-                "tests/e2e/cucumber/features/smoke/{spaces,admin-settings}/*.feature",
+            "suites": [
+                "admin-settings",
+                "spaces",
             ],
         },
         "oCIS-3": {
             "earlyFail": True,
             "skip": False,
             "tikaNeeded": True,
-            "featurePaths": [
-                "tests/e2e/cucumber/features/smoke/{search,shares}/*.feature",
+            "suites": [
+                "search",
+                "shares",
             ],
         },
         "oCIS-app-provider": {
             "skip": False,
-            "featurePaths": [
-                "tests/e2e/cucumber/features/smoke/app-provider/*.feature",
+            "suites": [
+                "app-provider",
             ],
         },
     },
@@ -636,7 +639,7 @@ def e2eTests(ctx):
         "logLevel": "2",
         "reportTracing": "false",
         "db": "mysql:5.5",
-        "featurePaths": "",
+        "suites": [],
         "tikaNeeded": False,
     }
 
@@ -709,7 +712,8 @@ def e2eTests(ctx):
                      "image": OC_CI_NODEJS,
                      "environment": environment,
                      "commands": [
-                         "pnpm test:e2e:cucumber %s" % " ".join(params["featurePaths"]),
+                         "cd tests/e2e",
+                         "bash run-e2e.sh --suites %s" % ",".join(params["suites"]),
                      ],
                  }] + \
                  uploadTracingResult(ctx) + \
diff --git a/tests/e2e/cucumber/features/smoke/admin-settings/general.feature b/tests/e2e/cucumber/features/admin-settings/general.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/admin-settings/general.feature
rename to tests/e2e/cucumber/features/admin-settings/general.feature
diff --git a/tests/e2e/cucumber/features/smoke/admin-settings/groups.feature b/tests/e2e/cucumber/features/admin-settings/groups.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/admin-settings/groups.feature
rename to tests/e2e/cucumber/features/admin-settings/groups.feature
diff --git a/tests/e2e/cucumber/features/smoke/admin-settings/spaces.feature b/tests/e2e/cucumber/features/admin-settings/spaces.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/admin-settings/spaces.feature
rename to tests/e2e/cucumber/features/admin-settings/spaces.feature
diff --git a/tests/e2e/cucumber/features/smoke/admin-settings/users.feature b/tests/e2e/cucumber/features/admin-settings/users.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/admin-settings/users.feature
rename to tests/e2e/cucumber/features/admin-settings/users.feature
diff --git a/tests/e2e/cucumber/features/smoke/app-provider/lock.feature b/tests/e2e/cucumber/features/app-provider/lock.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/app-provider/lock.feature
rename to tests/e2e/cucumber/features/app-provider/lock.feature
diff --git a/tests/e2e/cucumber/features/smoke/app-provider/officeSuites.feature b/tests/e2e/cucumber/features/app-provider/officeSuites.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/app-provider/officeSuites.feature
rename to tests/e2e/cucumber/features/app-provider/officeSuites.feature
diff --git a/tests/e2e/cucumber/features/smoke/app-provider/urlJourneys.feature b/tests/e2e/cucumber/features/app-provider/urlJourneys.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/app-provider/urlJourneys.feature
rename to tests/e2e/cucumber/features/app-provider/urlJourneys.feature
diff --git a/tests/e2e/cucumber/features/smoke/search/fullTextSearch.feature b/tests/e2e/cucumber/features/search/fullTextSearch.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/search/fullTextSearch.feature
rename to tests/e2e/cucumber/features/search/fullTextSearch.feature
diff --git a/tests/e2e/cucumber/features/smoke/search/search.feature b/tests/e2e/cucumber/features/search/search.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/search/search.feature
rename to tests/e2e/cucumber/features/search/search.feature
diff --git a/tests/e2e/cucumber/features/smoke/search/searchProjectSpace.feature b/tests/e2e/cucumber/features/search/searchProjectSpace.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/search/searchProjectSpace.feature
rename to tests/e2e/cucumber/features/search/searchProjectSpace.feature
diff --git a/tests/e2e/cucumber/features/smoke/shares/denyShareAccess.feature b/tests/e2e/cucumber/features/shares/denyShareAccess.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/shares/denyShareAccess.feature
rename to tests/e2e/cucumber/features/shares/denyShareAccess.feature
diff --git a/tests/e2e/cucumber/features/smoke/shares/internalLink.feature b/tests/e2e/cucumber/features/shares/internalLink.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/shares/internalLink.feature
rename to tests/e2e/cucumber/features/shares/internalLink.feature
diff --git a/tests/e2e/cucumber/features/smoke/shares/link.feature b/tests/e2e/cucumber/features/shares/link.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/shares/link.feature
rename to tests/e2e/cucumber/features/shares/link.feature
diff --git a/tests/e2e/cucumber/features/smoke/shares/share.feature b/tests/e2e/cucumber/features/shares/share.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/shares/share.feature
rename to tests/e2e/cucumber/features/shares/share.feature
diff --git a/tests/e2e/cucumber/features/smoke/spaces/downloadSpace.feature b/tests/e2e/cucumber/features/spaces/downloadSpace.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/spaces/downloadSpace.feature
rename to tests/e2e/cucumber/features/spaces/downloadSpace.feature
diff --git a/tests/e2e/cucumber/features/smoke/spaces/internalLink.feature b/tests/e2e/cucumber/features/spaces/internalLink.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/spaces/internalLink.feature
rename to tests/e2e/cucumber/features/spaces/internalLink.feature
diff --git a/tests/e2e/cucumber/features/smoke/spaces/memberExpiry.feature b/tests/e2e/cucumber/features/spaces/memberExpiry.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/spaces/memberExpiry.feature
rename to tests/e2e/cucumber/features/spaces/memberExpiry.feature
diff --git a/tests/e2e/cucumber/features/smoke/spaces/pagination.feature b/tests/e2e/cucumber/features/spaces/pagination.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/spaces/pagination.feature
rename to tests/e2e/cucumber/features/spaces/pagination.feature
diff --git a/tests/e2e/cucumber/features/smoke/spaces/participantManagement.feature b/tests/e2e/cucumber/features/spaces/participantManagement.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/spaces/participantManagement.feature
rename to tests/e2e/cucumber/features/spaces/participantManagement.feature
diff --git a/tests/e2e/cucumber/features/smoke/spaces/project.feature b/tests/e2e/cucumber/features/spaces/project.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/spaces/project.feature
rename to tests/e2e/cucumber/features/spaces/project.feature
diff --git a/tests/e2e/cucumber/features/smoke/spaces/publicLink.feature b/tests/e2e/cucumber/features/spaces/publicLink.feature
similarity index 100%
rename from tests/e2e/cucumber/features/smoke/spaces/publicLink.feature
rename to tests/e2e/cucumber/features/spaces/publicLink.feature
diff --git a/tests/e2e/run-e2e.sh b/tests/e2e/run-e2e.sh
new file mode 100755
index 00000000000..495a0d3ffd0
--- /dev/null
+++ b/tests/e2e/run-e2e.sh
@@ -0,0 +1,203 @@
+#!/usr/bin/env bash
+
+SCRIPT_PATH=$(dirname "$0")
+SCRIPT_PATH=$(cd "${SCRIPT_PATH_REL}" && pwd) # absolute path
+FEATURES_DIR="${SCRIPT_PATH}/cucumber/features"
+PROJECT_ROOT=$(cd "$SCRIPT_PATH/../../" && pwd)
+SCRIPT_PATH_REL=${SCRIPT_PATH//"$PROJECT_ROOT/"/}
+
+E2E_COMMAND="pnpm test:e2e:cucumber" # run command defined in package.json
+
+ALL_SUITES=$(find "${FEATURES_DIR}"/ -type d | sort | rev | cut -d"/" -f1 | rev | grep -v '^[[:space:]]*$')
+FILTER_SUITES=""
+EXCLUDE_SUITES=""
+FEATURE_PATHS=""
+GLOB_FEATURE_PATHS=""
+FEATURE_PATHS_FROM_ARG=""
+
+SKIP_RUN_PARTS=true
+RUN_PART=""
+TOTAL_PARTS=""
+
+HELP_COMMAND="
+COMMAND [options] [paths]
+
+Available options:
+    --suites        - suites to run. Comma separated values (folder names)
+                      e.g.: --suites smoke,shares
+    --xsuites       - exclude suites from running. Comma separated values
+                      e.g.: --xsuites spaces,search
+    --run-part      - part to run out of total parts (groups)
+                      e.g.: --run-part 2 (runs part 2 out of 4)
+    --total-parts   - total number of groups to divide into
+                      e.g.: --total-parts 4 (suites will be divided into 4 groups)
+    --help, -h      - show cli options
+"
+
+function log() {
+    case $1 in
+    info)
+        echo -e "\e[0mINF: $2\e[0m"
+        ;;
+    error)
+        echo -e "\e[31mERR: $2\e[0m"
+        ;;
+    warn)
+        echo -e "\e[93mWRN: $2\e[0m"USAGE:
+        ;;
+    cmd)
+        echo -e "\e[96mUSAGE: $2\e[0m"
+        ;;
+    *)
+        echo -e "\e[0m$1\e[0m"
+        ;;
+    esac
+}
+
+while [[ $# -gt 0 ]]; do
+    key="$1"
+    case ${key} in
+    --suites)
+        FILTER_SUITES=$(echo "$2" | sed -E "s/,/\n/g")
+        shift 2
+        ;;
+    --xsuites)
+        EXCLUDE_SUITES=$(echo "$2" | sed -E "s/,/\n/g")
+        shift 2
+        ;;
+    --run-part)
+        SKIP_RUN_PARTS=false
+        RUN_PART=$2
+        shift 2
+        ;;
+    --total-parts)
+        SKIP_RUN_PARTS=false
+        TOTAL_PARTS=$2
+        shift 2
+        ;;
+    --help | -h)
+        log "$HELP_COMMAND"
+        exit 0
+        ;;
+    *)
+        if [[ $1 =~ ^-.* ]]; then
+            log error "Unknown option: '$1'"
+            log "$HELP_COMMAND"
+            exit 1
+        fi
+        FEATURE_PATHS_FROM_ARG+=" $1" # maintain the white space
+        shift
+        ;;
+    esac
+done
+
+function getFeaturePaths() {
+    # $1    - paths to suite or feature file
+    paths=$(echo "$1" | xargs)
+    real_paths=""
+    for path in $paths; do
+        real_paths+=" $SCRIPT_PATH/$path" # maintain the white space
+        a_path=$(echo "$path" | cut -d ":" -f1)
+        if [[ ! -f $a_path && ! -d $a_path ]]; then
+            log error "File or folder doesn't exist: '$a_path'"
+            log info "Path must be relative to '$SCRIPT_PATH_REL'"
+            exit 1
+        fi
+    done
+    FEATURE_PATHS=$(echo "$real_paths" | xargs) # remove trailing white spaces
+}
+
+function runE2E() {
+    if [[ ! -d "$PROJECT_ROOT" ]]; then
+        log error "Project root doesn't exist: '$PROJECT_ROOT'"
+    fi
+    cd "$PROJECT_ROOT" || exit 1
+    if [[ -n $GLOB_FEATURE_PATHS ]]; then
+        $E2E_COMMAND "$GLOB_FEATURE_PATHS" # run without expanding glob pattern
+    else
+        # shellcheck disable=SC2086
+        $E2E_COMMAND $FEATURE_PATHS # do not enclose paths with quote
+    fi
+    exit $?
+}
+
+function checkSuites() {
+    # $1    - suites (separated by space or newline)
+    for e_suite in $1; do
+        exists=false
+        for a_suite in $ALL_SUITES; do
+            if [[ "$e_suite" == "$a_suite" ]]; then
+                exists=true
+            fi
+        done
+        if [[ "$exists" == false ]]; then
+            log error "Suite doesn't exist: '$e_suite'"
+            exit 1
+        fi
+    done
+}
+
+function buildSuitesPattern() {
+    CURRENT_SUITES_COUNT=$(echo "$1" | wc -w) # count words
+    suites=$(echo "$1" | xargs | sed -E "s/( )+/,/g")
+    if [[ $CURRENT_SUITES_COUNT -gt 1 ]]; then
+        suites="{$suites}"
+    fi
+    GLOB_FEATURE_PATHS="$FEATURES_DIR/$suites/**/*.feature"
+}
+
+# 1. [RUN E2E] run features from provided paths
+if [[ -n $FEATURE_PATHS_FROM_ARG && "$SKIP_RUN_PARTS" == true ]]; then
+    getFeaturePaths "$FEATURE_PATHS_FROM_ARG"
+    log info "Running e2e using paths. All cli options will be discarded"
+    runE2E
+fi
+
+# check if suites exist
+if [[ -n $FILTER_SUITES ]]; then
+    checkSuites "$FILTER_SUITES"
+    ALL_SUITES=$FILTER_SUITES
+fi
+if [[ -n $EXCLUDE_SUITES ]]; then
+    checkSuites "$EXCLUDE_SUITES"
+fi
+
+# exclude suites from running
+if [[ -n $EXCLUDE_SUITES ]]; then
+    for exclude_suite in $EXCLUDE_SUITES; do
+        ALL_SUITES=$(echo "${ALL_SUITES/$exclude_suite/}" | sed -E "/^( )*$/d") # remove suite and trim empty lines
+    done
+fi
+
+if [[ "$SKIP_RUN_PARTS" != true ]]; then
+    if [[ -z $RUN_PART ]]; then
+        log error "Missing '--run-part'"
+        log cmd "--run-part <number>"
+        exit 1
+    fi
+    if [[ -z $TOTAL_PARTS ]]; then
+        log error "Missing '--total-parts'"
+        log cmd "--total-parts <number>"
+        exit 1
+    fi
+
+    ALL_SUITES_COUNT=$(echo "${ALL_SUITES}" | wc -l)
+    SUITES_PER_RUN=$((ALL_SUITES_COUNT / TOTAL_PARTS))
+    REMAINING_SUITES=$((ALL_SUITES_COUNT - (TOTAL_PARTS * SUITES_PER_RUN)))
+
+    if [[ ${RUN_PART} -le ${REMAINING_SUITES} ]]; then
+        SUITES_PER_RUN=$((SUITES_PER_RUN + 1))
+        PREVIOUS_SUITES_COUNT=$(((RUN_PART - 1) * SUITES_PER_RUN))
+    else
+        PREV_MAX_SUITES=$((REMAINING_SUITES * (SUITES_PER_RUN + 1)))
+        PREV_MIN_SUITES=$((((RUN_PART - 1) - REMAINING_SUITES) * SUITES_PER_RUN))
+        PREVIOUS_SUITES_COUNT=$((PREV_MAX_SUITES + PREV_MIN_SUITES))
+    fi
+
+    GRAB_SUITES_UPTO=$((PREVIOUS_SUITES_COUNT + SUITES_PER_RUN))
+    ALL_SUITES=$(echo "${ALL_SUITES}" | head -n "$GRAB_SUITES_UPTO" | tail -n "$SUITES_PER_RUN")
+fi
+
+buildSuitesPattern "$ALL_SUITES"
+# 2. [RUN E2E] run the suites
+runE2E