diff --git a/Makefile b/Makefile
index 744697f2fc..dd49069100 100644
--- a/Makefile
+++ b/Makefile
@@ -221,7 +221,7 @@ upload-hoogle-image:
 ## cassandra management
 
 .PHONY: git-add-cassandra-schema
-git-add-cassandra-schema: db-reset git-add-cassandra-schema-impl
+git-add-cassandra-schema: db-migrate git-add-cassandra-schema-impl
 
 .PHONY: git-add-cassandra-schema-impl
 git-add-cassandra-schema-impl:
diff --git a/services/brig/src/Brig/Options.hs b/services/brig/src/Brig/Options.hs
index 53a052cb7f..66904d3ce0 100644
--- a/services/brig/src/Brig/Options.hs
+++ b/services/brig/src/Brig/Options.hs
@@ -556,7 +556,7 @@ data Settings = Settings
     -- It should also match the SRV DNS records under which other wire-server installations can find this backend:
     --    _wire-server-federator._tcp.<federationDomain>
     -- Once set, DO NOT change it: if you do, existing users may have a broken experience and/or stop working
-    -- Remember to keep it the same in Galley.
+    -- Remember to keep it the same in all services.
     -- Example:
     --   allowedDomains:
     --     - wire.com
diff --git a/services/brig/test/integration/API/OAuth.hs b/services/brig/test/integration/API/OAuth.hs
index 129dbe4d5f..3efdd15fa4 100644
--- a/services/brig/test/integration/API/OAuth.hs
+++ b/services/brig/test/integration/API/OAuth.hs
@@ -459,8 +459,9 @@ testRefreshTokenMaxActiveTokens opts db brig =
       let accessTokenRequest = OAuthAccessTokenRequest OAuthGrantTypeAuthorizationCode cid verifier code redirectUrl
       resp <- createOAuthAccessToken brig accessTokenRequest
       rid <- extractRefreshTokenId jwk resp.refreshToken
-      tokens <- C.runClient db (lookupOAuthRefreshTokens uid)
-      liftIO $ assertBool testMsg $ [rid2, rid] `hasSameElems` (refreshTokenId <$> tokens)
+      recoverN 3 $ do
+        tokens <- C.runClient db (lookupOAuthRefreshTokens uid)
+        liftIO $ assertBool testMsg $ [rid2, rid] `hasSameElems` (refreshTokenId <$> tokens)
       pure rid
     delayOneSec
     do
diff --git a/services/cargohold/src/CargoHold/Options.hs b/services/cargohold/src/CargoHold/Options.hs
index c6c7076e99..e4bc760c15 100644
--- a/services/cargohold/src/CargoHold/Options.hs
+++ b/services/cargohold/src/CargoHold/Options.hs
@@ -130,7 +130,7 @@ data Settings = Settings
     -- It should also match the SRV DNS records under which other wire-server installations can find this backend:
     --    _wire-server-federator._tcp.<federationDomain>
     -- Once set, DO NOT change it: if you do, existing users may have a broken experience and/or stop working
-    -- Remember to keep it the same in Galley and in Brig.
+    -- Remember to keep it the same in all services.
     -- This is referred to as the 'backend domain' in the public documentation; See
     -- https://docs.wire.com/how-to/install/configure-federation.html#choose-a-backend-domain-name
     _setFederationDomain :: !Domain,
diff --git a/services/galley/src/Galley/Options.hs b/services/galley/src/Galley/Options.hs
index 844ca39064..d9776451eb 100644
--- a/services/galley/src/Galley/Options.hs
+++ b/services/galley/src/Galley/Options.hs
@@ -101,7 +101,7 @@ data Settings = Settings
     -- It should also match the SRV DNS records under which other wire-server installations can find this backend:
     --    _wire-server-federator._tcp.<federationDomain>
     -- Once set, DO NOT change it: if you do, existing users may have a broken experience and/or stop working
-    -- Remember to keep it the same in Galley.
+    -- Remember to keep it the same in all services.
     -- Example:
     --   allowedDomains:
     --     - wire.com