diff --git a/.vscode/launch.json b/.vscode/launch.json
index 3cd0bdb5d..47106ab99 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -110,7 +110,9 @@
             "AUTH_SERVICE_DEBUG_ADDR": "127.0.0.1:10169",
             "AUTH_SERVICE_GRPC_ADDR": "127.0.0.1:10199",
             "CLIENTLOG_DEBUG_ADDR": "127.0.0.1:10260",
+            "ACTIVITYLOG_HTTP_ADDR": "127.0.0.1:10195",
             "ACTIVITYLOG_DEBUG_ADDR": "127.0.0.1:10261",
+            "EVENTHISTORY_GRPC_ADDR": "127.0.0.1:10274",
             "EVENTHISTORY_DEBUG_ADDR": "127.0.0.1:10270",
             "FRONTEND_DEBUG_ADDR": "127.0.0.1:10141",
             "FRONTEND_HTTP_ADDR": "127.0.0.1:10140",
@@ -126,6 +128,7 @@
             "IDP_HTTP_ADDR": "127.0.0.1:10130",
             "NATS_DEBUG_ADDR": "127.0.0.1:10234",
             "NATS_NATS_PORT": "10233",
+            "OCDAV_HTTP_ADDR": "127.0.0.1:10350",
             "OCDAV_DEBUG_ADDR": "127.0.0.1:10163",
             "OCM_DEBUG_ADDR": "127.0.0.1:10281",
             "OCM_HTTP_ADDR": "127.0.0.1:10280",
@@ -143,6 +146,7 @@
             "SETTINGS_HTTP_ADDR": "127.0.0.1:10186",
             "SHARING_DEBUG_ADDR": "127.0.0.1:10151",
             "SHARING_GRPC_ADDR": "127.0.0.1:10150",
+            "SSE_HTTP_ADDR": "127.0.0.1:10132",
             "SSE_DEBUG_ADDR": "127.0.0.1:10135",
             "STORAGE_PUBLICLINK_DEBUG_ADDR": "127.0.0.1:10179",
             "STORAGE_PUBLICLINK_GRPC_ADDR": "127.0.0.1:10178",
@@ -161,6 +165,7 @@
             "THUMBNAILS_DEBUG_ADDR": "127.0.0.1:10194",
             "THUMBNAILS_GRPC_ADDR": "127.0.0.1:10191",
             "THUMBNAILS_HTTP_ADDR": "127.0.0.1:10190",
+            "USERLOG_HTTP_ADDR": "127.0.0.1:10211",
             "USERLOG_DEBUG_ADDR": "127.0.0.1:10210",
             "USERS_DEBUG_ADDR": "127.0.0.1:10145",
             "USERS_GRPC_ADDR": "127.0.0.1:10144",
@@ -168,6 +173,8 @@
             "WEB_HTTP_ADDR": "localhost:10100",
             "WEBDAV_DEBUG_ADDR": "127.0.0.1:10119",
             "WEBDAV_HTTP_ADDR": "127.0.0.1:10115",
+            "WEBFINGER_DEBUG_ADDR": "127.0.0.1:10279",
+            "WEBFINGER_HTTP_ADDR": "127.0.0.1:10275",
             "OCIS_SERVICE_ACCOUNT_ID": "serviceaccount",
             "OCIS_SERVICE_ACCOUNT_SECRET": "serviceaccountsecret",
             "OCIS_DECOMPOSEDFS_PROPAGATOR": "async",
diff --git a/tests/config/drone/.env-federation b/tests/config/drone/.env-federation
index 760aed4cb..b6d5cc4d2 100644
--- a/tests/config/drone/.env-federation
+++ b/tests/config/drone/.env-federation
@@ -21,7 +21,9 @@ export AUTH_MACHINE_GRPC_ADDR=127.0.0.1:10166
 export AUTH_SERVICE_DEBUG_ADDR=127.0.0.1:10169
 export AUTH_SERVICE_GRPC_ADDR=127.0.0.1:10199
 export CLIENTLOG_DEBUG_ADDR=127.0.0.1:10260
+export ACTIVITYLOG_HTTP_ADDR=127.0.0.1:10195
 export ACTIVITYLOG_DEBUG_ADDR=127.0.0.1:10261
+export EVENTHISTORY_GRPC_ADDR=127.0.0.1:10274
 export EVENTHISTORY_DEBUG_ADDR=127.0.0.1:10270
 export FRONTEND_DEBUG_ADDR=127.0.0.1:10141
 export FRONTEND_HTTP_ADDR=127.0.0.1:10140
@@ -37,6 +39,7 @@ export IDP_DEBUG_ADDR=127.0.0.1:10134
 export IDP_HTTP_ADDR=127.0.0.1:10130
 export NATS_DEBUG_ADDR=127.0.0.1:10234
 export NATS_NATS_PORT=10233
+export OCDAV_HTTP_ADDR=127.0.0.1:10350
 export OCDAV_DEBUG_ADDR=127.0.0.1:10163
 export OCM_DEBUG_ADDR=127.0.0.1:10281
 export OCM_HTTP_ADDR=127.0.0.1:10280
@@ -55,6 +58,7 @@ export SETTINGS_HTTP_ADDR=127.0.0.1:10186
 export SHARING_DEBUG_ADDR=127.0.0.1:10151
 export SHARING_GRPC_ADDR=127.0.0.1:10150
 export SSE_DEBUG_ADDR=127.0.0.1:10135
+export SSE_HTTP_ADDR=127.0.0.1:10132
 export STORAGE_PUBLICLINK_DEBUG_ADDR=127.0.0.1:10179
 export STORAGE_PUBLICLINK_GRPC_ADDR=127.0.0.1:10178
 export STORAGE_SHARES_DEBUG_ADDR=127.0.0.1:10156
@@ -72,6 +76,7 @@ export STORE_GRPC_ADDR=127.0.0.1:10460
 export THUMBNAILS_DEBUG_ADDR=127.0.0.1:10194
 export THUMBNAILS_GRPC_ADDR=127.0.0.1:10191
 export THUMBNAILS_HTTP_ADDR=127.0.0.1:10190
+export USERLOG_HTTP_ADDR=127.0.0.1:10211
 export USERLOG_DEBUG_ADDR=127.0.0.1:10210
 export USERS_DEBUG_ADDR=127.0.0.1:10145
 export USERS_GRPC_ADDR=127.0.0.1:10144
@@ -79,6 +84,8 @@ export WEB_DEBUG_ADDR=localhost:10104
 export WEB_HTTP_ADDR=localhost:10100
 export WEBDAV_DEBUG_ADDR=127.0.0.1:10119
 export WEBDAV_HTTP_ADDR=127.0.0.1:10115
+export WEBFINGER_DEBUG_ADDR=127.0.0.1:10279
+export WEBFINGER_HTTP_ADDR=127.0.0.1:10275
 export OCIS_SERVICE_ACCOUNT_ID=serviceaccount
 export OCIS_SERVICE_ACCOUNT_SECRET=serviceaccountsecret
 export OCIS_DECOMPOSEDFS_PROPAGATOR=async
@@ -111,4 +118,4 @@ export USERS_LDAP_BIND_PASSWORD=some-ldap-reva-password
 export AUTH_BASIC_LDAP_BIND_PASSWORD=some-ldap-reva-password
 export IDM_IDPSVC_PASSWORD=some-ldap-idp-password
 export IDP_LDAP_BIND_PASSWORD=some-ldap-idp-password
-export GRAPH_APPLICATION_ID=application-1export 
\ No newline at end of file
+export GRAPH_APPLICATION_ID=application-1export