diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/MapperModule.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
deleted file mode 100644
index fc2f456d46..0000000000
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/api/v2/resources/MapperModule.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package sonia.scm.api.v2.resources;
-
-import com.google.inject.AbstractModule;
-import com.google.inject.servlet.ServletScopes;
-import org.mapstruct.factory.Mappers;
-import sonia.scm.plugin.Extension;
-
-@Extension
-public class MapperModule extends AbstractModule {
-  @Override
-  protected void configure() {
-
-    bind(GitConfigDtoToGitConfigMapper.class).to(Mappers.getMapper(GitConfigDtoToGitConfigMapper.class).getClass());
-    bind(GitConfigToGitConfigDtoMapper.class).to(Mappers.getMapper(GitConfigToGitConfigDtoMapper.class).getClass());
-
-    bind(UriInfoStore.class).in(ServletScopes.REQUEST);
-  }
-}
diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java
index 3d3442ce2a..bdad103c15 100644
--- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java
+++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitServletModule.java
@@ -36,11 +36,11 @@ package sonia.scm.web;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.inject.servlet.ServletModule;
-
 import org.eclipse.jgit.transport.ScmTransportProtocol;
-
+import org.mapstruct.factory.Mappers;
+import sonia.scm.api.v2.resources.GitConfigDtoToGitConfigMapper;
+import sonia.scm.api.v2.resources.GitConfigToGitConfigDtoMapper;
 import sonia.scm.plugin.Extension;
-
 import sonia.scm.web.lfs.LfsBlobStoreFactory;
 
 /**
@@ -73,6 +73,9 @@ public class GitServletModule extends ServletModule
     
     bind(LfsBlobStoreFactory.class);
 
+    bind(GitConfigDtoToGitConfigMapper.class).to(Mappers.getMapper(GitConfigDtoToGitConfigMapper.class).getClass());
+    bind(GitConfigToGitConfigDtoMapper.class).to(Mappers.getMapper(GitConfigToGitConfigDtoMapper.class).getClass());
+
     // serlvelts and filters
     serve(PATTERN_GIT).with(ScmGitServlet.class);
   }