diff --git a/pom.xml b/pom.xml
index 9f40380f3..edb5325a8 100755
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
         <jenkins.baseline>2.504</jenkins.baseline>
-        <jenkins.version>${jenkins.baseline}.1</jenkins.version>
+        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <release.skipTests>false</release.skipTests>
         <ban-junit4-imports.skip>false</ban-junit4-imports.skip>
         <tagNameFormat>v@{project.version}</tagNameFormat>
@@ -204,10 +204,16 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>4710.v016f0a_07e34d</version>
+                <version>5804.v80587a_38d937</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <!-- TODO until in BOM -->
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>credentials</artifactId>
+                <version>1480.v2246fd131e83</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java b/src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java
index 9fed6de8d..9cb92a5d5 100644
--- a/src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java
+++ b/src/main/java/org/jenkinsci/plugins/github/config/GitHubServerConfig.java
@@ -2,7 +2,6 @@
 
 import com.cloudbees.plugins.credentials.CredentialsMatchers;
 import com.cloudbees.plugins.credentials.common.StandardListBoxModel;
-import com.cloudbees.plugins.credentials.domains.DomainRequirement;
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
@@ -21,13 +20,10 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Collections;
-import java.util.List;
 import jenkins.model.Jenkins;
 import jenkins.scm.api.SCMName;
 import org.apache.commons.lang3.StringUtils;
 import org.jenkinsci.plugins.github.internal.GitHubLoginFunction;
-import org.jenkinsci.plugins.github.util.FluentIterableWrapper;
 import org.jenkinsci.plugins.github.util.misc.NullSafeFunction;
 import org.jenkinsci.plugins.github.util.misc.NullSafePredicate;
 import org.jenkinsci.plugins.plaincredentials.StringCredentials;
@@ -41,14 +37,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.cloudbees.plugins.credentials.CredentialsMatchers.filter;
-import static com.cloudbees.plugins.credentials.CredentialsMatchers.withId;
-import static com.cloudbees.plugins.credentials.CredentialsProvider.lookupCredentials;
+import static com.cloudbees.plugins.credentials.CredentialsProvider.findCredentialByIdInItemGroup;
 import static com.cloudbees.plugins.credentials.domains.URIRequirementBuilder.fromUri;
 import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
 import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
-import static org.apache.commons.lang3.StringUtils.trimToEmpty;
 
 /**
  * This object represents configuration of each credentials-github pair.
@@ -287,20 +280,14 @@ public Secret get() {
      */
     @NonNull
     public static Optional<Secret> secretFor(String credentialsId) {
-        List<StringCredentials> creds = filter(
-                lookupCredentials(StringCredentials.class,
-                        Jenkins.getInstance(), ACL.SYSTEM,
-                        Collections.<DomainRequirement>emptyList()),
-                withId(trimToEmpty(credentialsId))
-        );
-
-        return FluentIterableWrapper.from(creds)
-                .transform(new NullSafeFunction<StringCredentials, Secret>() {
-                    @Override
-                    protected Secret applyNullSafe(@NonNull StringCredentials input) {
-                        return input.getSecret();
-                    }
-                }).first();
+        if (credentialsId == null) {
+            return Optional.absent();
+        }
+        var creds = findCredentialByIdInItemGroup(credentialsId, StringCredentials.class, null, null, null);
+        if (creds == null) {
+            return Optional.absent();
+        }
+        return Optional.of(creds.getSecret());
     }
 
     /**