diff --git a/.drone.yml b/.drone.yml
index d25ce08230f..3e2014d6dd1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,7 +6,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: sqlite
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -41,7 +41,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: sqlite
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -76,7 +76,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: sqlite
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -111,7 +111,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       GUESTS_BRANCH: master
       DATABASEHOST: sqlite
     commands:
@@ -148,7 +148,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       GUESTS_BRANCH: master
       DATABASEHOST: sqlite
     commands:
@@ -185,7 +185,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: sqlite
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -220,7 +220,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: sqlite
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -255,7 +255,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: mysql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -300,7 +300,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: mysql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -345,7 +345,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: mysql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -390,7 +390,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       GUESTS_BRANCH: master
       DATABASEHOST: mysql
     commands:
@@ -437,7 +437,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       GUESTS_BRANCH: master
       DATABASEHOST: mysql
     commands:
@@ -484,7 +484,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: mysql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -529,7 +529,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: mysql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -574,7 +574,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: pgsql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -618,7 +618,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: pgsql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -662,7 +662,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: pgsql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -706,7 +706,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       GUESTS_BRANCH: master
       DATABASEHOST: pgsql
     commands:
@@ -752,7 +752,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       GUESTS_BRANCH: master
       DATABASEHOST: pgsql
     commands:
@@ -798,7 +798,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: pgsql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -842,7 +842,7 @@ steps:
     image: ghcr.io/nextcloud/continuous-integration-php8.0:latest
     environment:
       APP_NAME: spreed
-      CORE_BRANCH: master
+      CORE_BRANCH: enh/http-auth-session
       DATABASEHOST: pgsql
     commands:
       - bash tests/drone-run-integration-tests.sh || exit 0
@@ -886,7 +886,7 @@ trigger:
 #    image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
 #    environment:
 #      APP_NAME: spreed
-#      CORE_BRANCH: master
+#      CORE_BRANCH: enh/http-auth-session
 #      SELENIUM_HOST: selenium
 #      TESTS_ACCEPTANCE: app-files
 #    commands:
@@ -926,7 +926,7 @@ trigger:
 #    image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
 #    environment:
 #      APP_NAME: spreed
-#      CORE_BRANCH: master
+#      CORE_BRANCH: enh/http-auth-session
 #      SELENIUM_HOST: selenium
 #      TESTS_ACCEPTANCE: chat
 #    commands:
@@ -968,7 +968,7 @@ trigger:
 #    image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
 #    environment:
 #      APP_NAME: spreed
-#      CORE_BRANCH: master
+#      CORE_BRANCH: enh/http-auth-session
 #      SELENIUM_HOST: selenium
 #      TESTS_ACCEPTANCE: conversation
 #    commands:
@@ -1010,7 +1010,7 @@ trigger:
 #    image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
 #    environment:
 #      APP_NAME: spreed
-#      CORE_BRANCH: master
+#      CORE_BRANCH: enh/http-auth-session
 #      SELENIUM_HOST: selenium
 #      TESTS_ACCEPTANCE: conversation-public
 #    commands:
@@ -1052,7 +1052,7 @@ trigger:
 #    image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
 #    environment:
 #      APP_NAME: spreed
-#      CORE_BRANCH: master
+#      CORE_BRANCH: enh/http-auth-session
 #      SELENIUM_HOST: selenium
 #      TESTS_ACCEPTANCE: lobby
 #    commands:
@@ -1092,7 +1092,7 @@ trigger:
 #    image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
 #    environment:
 #      APP_NAME: spreed
-#      CORE_BRANCH: master
+#      CORE_BRANCH: enh/http-auth-session
 #      SELENIUM_HOST: selenium
 #      TESTS_ACCEPTANCE: public-share
 #    commands:
@@ -1134,7 +1134,7 @@ trigger:
 #    image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
 #    environment:
 #      APP_NAME: spreed
-#      CORE_BRANCH: master
+#      CORE_BRANCH: enh/http-auth-session
 #      SELENIUM_HOST: selenium
 #      TESTS_ACCEPTANCE: public-share-auth
 #    commands:
@@ -1176,7 +1176,7 @@ trigger:
 #    image: nextcloudci/acceptance-php7.1:acceptance-php7.1-2
 #    environment:
 #      APP_NAME: spreed
-#      CORE_BRANCH: master
+#      CORE_BRANCH: enh/http-auth-session
 #      SELENIUM_HOST: selenium
 #      TESTS_ACCEPTANCE: room-shares
 #    commands:
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 7f61420fef3..788548b6383 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -27,7 +27,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['sqlite']
-        server-versions: ['master']
+        server-versions: ['enh/http-auth-session']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -89,7 +89,7 @@ jobs:
       matrix:
         php-versions: ['7.4', '8.0']
         databases: ['mysql']
-        server-versions: ['master']
+        server-versions: ['enh/http-auth-session']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -160,7 +160,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['pgsql']
-        server-versions: ['master']
+        server-versions: ['enh/http-auth-session']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}
 
@@ -233,7 +233,7 @@ jobs:
       matrix:
         php-versions: ['7.4']
         databases: ['oci']
-        server-versions: ['master']
+        server-versions: ['enh/http-auth-session']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}