diff --git a/modules/github_integration/app/workers/cron/check_deploy_status_job.rb b/modules/github_integration/app/workers/cron/check_deploy_status_job.rb
index 6a27e3e5bd6..f8ea9bae7a0 100644
--- a/modules/github_integration/app/workers/cron/check_deploy_status_job.rb
+++ b/modules/github_integration/app/workers/cron/check_deploy_status_job.rb
@@ -157,7 +157,7 @@ module Cron
     end
 
     def introspection_request(host, api_token)
-      OpenProject.httpx.basic_auth("apikey", api_token).get("https://#{host}/api/v3")
+      OpenProject.httpx.plugin(:basic_auth).basic_auth("apikey", api_token).get("https://#{host}/api/v3")
     end
 
     ##
@@ -188,7 +188,7 @@ module Cron
       ahead_by = data["ahead_by"].presence
       behind_by = data["behind_by"].presence
 
-      status == "behind" && ahead_by == 0 && (behind_by.present? && behind_by > 0)
+      status == "behind" && ahead_by == 0 && behind_by.present? && behind_by > 0
     end
 
     def compare_commits(sha_a, sha_b)
diff --git a/modules/openid_connect/app/services/openid_connect/user_tokens/token_request.rb b/modules/openid_connect/app/services/openid_connect/user_tokens/token_request.rb
index f774185c546..3d43de64ec9 100644
--- a/modules/openid_connect/app/services/openid_connect/user_tokens/token_request.rb
+++ b/modules/openid_connect/app/services/openid_connect/user_tokens/token_request.rb
@@ -78,7 +78,7 @@ module OpenIDConnect
         # Client ID and Client Secret must be form-encoded. Otherwise characters such as colon (:)
         # would not be allowed in the Client ID, since HTTP Basic Auth does not support it
         # as per https://datatracker.ietf.org/doc/html/rfc7617#section-2
-        OpenProject.httpx.basic_auth(CGI.escape(provider.client_id), CGI.escape(provider.client_secret))
+        OpenProject.httpx.plugin(:basic_auth).basic_auth(CGI.escape(provider.client_id), CGI.escape(provider.client_secret))
       end
     end
   end
diff --git a/modules/storages/app/validator/nextcloud_application_credentials_validator.rb b/modules/storages/app/validator/nextcloud_application_credentials_validator.rb
index 794a10937b6..8aa7e1e5ed9 100644
--- a/modules/storages/app/validator/nextcloud_application_credentials_validator.rb
+++ b/modules/storages/app/validator/nextcloud_application_credentials_validator.rb
@@ -40,6 +40,7 @@ class NextcloudApplicationCredentialsValidator
 
     response = OpenProject
                  .httpx
+                 .plugin(:basic_auth)
                  .basic_auth(contract.username, contract.password)
                  .head(Storages::UrlBuilder.url(contract.model.uri, "remote.php/dav"))
     case response