diff --git a/pom.xml b/pom.xml
index 1ef01d1f..a91d90aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
   <properties>
     <changelist>999999-SNAPSHOT</changelist>
     <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-    <jenkins.baseline>2.492</jenkins.baseline>
+    <jenkins.baseline>2.504</jenkins.baseline>
     <jenkins.version>${jenkins.baseline}.3</jenkins.version>
     <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     <spotless.check.skip>false</spotless.check.skip>
@@ -46,10 +46,16 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${jenkins.baseline}.x</artifactId>
-        <version>5054.v620b_5d2b_d5e6</version>
+        <version>5543.vfd758c7c868d</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <!-- TODO https://github.com/jenkinsci/gitlab-api-plugin/pull/121/ -->
+      <dependency>
+        <groupId>io.jenkins.plugins</groupId>
+        <artifactId>gitlab-api</artifactId>
+        <version>6.1.0-118.v78e2a_35b_f209</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -61,7 +67,6 @@
     <dependency>
       <groupId>io.jenkins.plugins</groupId>
       <artifactId>gitlab-api</artifactId>
-      <version>5.8.1-106.vef1de800710e</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java
index 3e65766d..b22694f0 100644
--- a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java
+++ b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java
@@ -85,8 +85,6 @@
 import jenkins.scm.impl.trait.Discovery;
 import jenkins.scm.impl.trait.Selection;
 import org.apache.commons.lang3.StringUtils;
-import org.gitlab4j.api.Constants;
-import org.gitlab4j.api.Constants.MergeRequestState;
 import org.gitlab4j.api.GitLabApi;
 import org.gitlab4j.api.GitLabApiException;
 import org.gitlab4j.api.models.AccessLevel;
@@ -96,6 +94,8 @@
 import org.gitlab4j.api.models.Project;
 import org.gitlab4j.api.models.ProjectFilter;
 import org.gitlab4j.api.models.Tag;
+import org.gitlab4j.models.Constants;
+import org.gitlab4j.models.Constants.MergeRequestState;
 import org.jenkins.ui.icon.IconSpec;
 import org.jenkinsci.Symbol;
 import org.jenkinsci.plugins.gitclient.GitClient;
diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java
index cfa180c1..17273a52 100644
--- a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java
+++ b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSystemHookAction.java
@@ -21,9 +21,8 @@
 import jenkins.scm.api.SCMEvent;
 import org.apache.commons.lang3.StringUtils;
 import org.gitlab4j.api.GitLabApiException;
-import org.gitlab4j.api.systemhooks.SystemHookManager;
+import org.gitlab4j.api.SystemHookManager;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension
@@ -81,7 +80,7 @@ public HttpResponse doPost(StaplerRequest2 request) throws GitLabApiException {
         String origin = SCMEvent.originOf(request);
         SystemHookManager systemHookManager = new SystemHookManager();
         systemHookManager.addListener(new GitLabSystemHookListener(origin));
-        systemHookManager.handleEvent(StaplerRequest.fromStaplerRequest2(request));
+        systemHookManager.handleEvent(request);
         return HttpResponses.ok(); // TODO find a better response
     }
 
diff --git a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java
index ad23ed60..0e8d80bb 100644
--- a/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java
+++ b/src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabWebHookAction.java
@@ -21,9 +21,8 @@
 import jenkins.scm.api.SCMEvent;
 import org.apache.commons.lang3.StringUtils;
 import org.gitlab4j.api.GitLabApiException;
-import org.gitlab4j.api.webhook.WebHookManager;
+import org.gitlab4j.api.WebHookManager;
 import org.kohsuke.stapler.HttpResponse;
-import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerRequest2;
 
 @Extension
@@ -81,7 +80,7 @@ public HttpResponse doPost(StaplerRequest2 request) throws IOException, GitLabAp
         String origin = SCMEvent.originOf(request);
         WebHookManager webHookManager = new WebHookManager();
         webHookManager.addListener(new GitLabWebHookListener(origin));
-        webHookManager.handleEvent(StaplerRequest.fromStaplerRequest2(request));
+        webHookManager.handleEvent(request);
         return HttpResponses.ok(); // TODO find a better response
     }