diff --git a/scm-core/src/main/java/sonia/scm/repository/api/ScmProtocol.java b/scm-core/src/main/java/sonia/scm/repository/api/ScmProtocol.java
index 8d44ec19ad..0d9e1ae88e 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/ScmProtocol.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/ScmProtocol.java
@@ -2,7 +2,7 @@ package sonia.scm.repository.api;
 
 import sonia.scm.repository.Repository;
 
-import javax.ws.rs.core.UriInfo;
+import java.net.URI;
 
 /**
  * An ScmProtocol represents a concrete protocol provided by the SCM-Manager instance
@@ -19,5 +19,5 @@ public interface ScmProtocol {
   /**
    * The URL to access the repository providing this protocol.
    */
-  String getUrl(Repository repository, UriInfo uriInfo);
+  String getUrl(Repository repository, URI baseUri);
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/HttpScmProtocol.java b/scm-core/src/main/java/sonia/scm/repository/spi/HttpScmProtocol.java
index fed9c00cdc..69952802fd 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/HttpScmProtocol.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/HttpScmProtocol.java
@@ -7,7 +7,6 @@ import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.UriInfo;
 import java.io.IOException;
 import java.net.URI;
 
@@ -18,8 +17,8 @@ public interface HttpScmProtocol extends ScmProtocol {
   }
 
   @Override
-  default String getUrl(Repository repository, UriInfo uriInfo) {
-    return uriInfo.getBaseUri().resolve(URI.create("../../repo/" + repository.getNamespace() + "/" + repository.getName())).toASCIIString();
+  default String getUrl(Repository repository, URI baseUri) {
+    return baseUri.resolve(URI.create("/repo" + "/" + repository.getNamespace() + "/" + repository.getName())).toASCIIString();
   }
 
   void serve(HttpServletRequest request, HttpServletResponse response, ServletConfig config) throws ServletException, IOException;
diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
index 2ea17e9da3..14fb8552f9 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
@@ -114,6 +114,7 @@ import sonia.scm.web.cgi.CGIExecutorFactory;
 import sonia.scm.web.cgi.DefaultCGIExecutorFactory;
 import sonia.scm.web.filter.AuthenticationFilter;
 import sonia.scm.web.filter.LoggingFilter;
+import sonia.scm.web.protocol.HttpProtocolServlet;
 import sonia.scm.web.security.AdministrationContext;
 import sonia.scm.web.security.DefaultAdministrationContext;
 
@@ -322,7 +323,7 @@ public class ScmServletModule extends ServletModule
     bind(TemplateEngineFactory.class);
     bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class);
 
-    filter("/repo/*").through(AuthenticationFilter.class);
+    filter(HttpProtocolServlet.PATTERN).through(AuthenticationFilter.class);
 
     // bind events
     // bind(LastModifiedUpdateListener.class);
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
index bc0073506e..62d7abedf7 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
@@ -67,6 +67,6 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
   }
 
   private Link createProtocolLink(ScmProtocol protocol, Repository repository) {
-    return Link.linkBuilder("protocol", protocol.getUrl(repository, uriInfoStore.get())).withName(protocol.getType()).build();
+    return Link.linkBuilder("protocol", protocol.getUrl(repository, uriInfoStore.get().getBaseUri().resolve("../.."))).withName(protocol.getType()).build();
   }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/web/protocol/HttpProtocolServlet.java b/scm-webapp/src/main/java/sonia/scm/web/protocol/HttpProtocolServlet.java
index d314628438..7ba4d2392c 100644
--- a/scm-webapp/src/main/java/sonia/scm/web/protocol/HttpProtocolServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/web/protocol/HttpProtocolServlet.java
@@ -28,7 +28,8 @@ import java.util.Optional;
 @Slf4j
 public class HttpProtocolServlet extends HttpServlet {
 
-  public static final String PATTERN = "/repo/*";
+  public static final String PATH = "/repo";
+  public static final String PATTERN = PATH + "/*";
 
   private final RepositoryServiceFactory serviceFactory;
 
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MockScmProtocol.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MockScmProtocol.java
index 64c45c8694..11dd1e231d 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MockScmProtocol.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MockScmProtocol.java
@@ -3,7 +3,7 @@ package sonia.scm.api.v2.resources;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.api.ScmProtocol;
 
-import javax.ws.rs.core.UriInfo;
+import java.net.URI;
 
 class MockScmProtocol implements ScmProtocol {
   private final String type;
@@ -20,7 +20,7 @@ class MockScmProtocol implements ScmProtocol {
   }
 
   @Override
-  public String getUrl(Repository repository, UriInfo uriInfo) {
+  public String getUrl(Repository repository, URI baseUri) {
     return protocol;
   }
 }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
index 6a13431f00..609ff282af 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
@@ -24,6 +24,7 @@ import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.web.VndMediaType;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.UriInfo;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -71,6 +72,8 @@ public class RepositoryRootResourceTest {
   private RepositoryService service;
   @Mock
   private UriInfoStore uriInfoStore;
+  @Mock
+  private UriInfo uriInfo;
 
 
   private final URI baseUri = URI.create("/");
@@ -89,6 +92,8 @@ public class RepositoryRootResourceTest {
     RepositoryCollectionResource repositoryCollectionResource = new RepositoryCollectionResource(repositoryManager, repositoryCollectionToDtoMapper, dtoToRepositoryMapper, resourceLinks);
     RepositoryRootResource repositoryRootResource = new RepositoryRootResource(MockProvider.of(repositoryResource), MockProvider.of(repositoryCollectionResource));
     when(serviceFactory.create(any(Repository.class))).thenReturn(service);
+    when(uriInfoStore.get()).thenReturn(uriInfo);
+    when(uriInfo.getBaseUri()).thenReturn(URI.create("/x/y"));
     dispatcher = createDispatcher(repositoryRootResource);
   }
 
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java
index 9fe2700e4a..b77ad958c3 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java
@@ -18,6 +18,7 @@ import sonia.scm.repository.api.RepositoryService;
 import sonia.scm.repository.api.RepositoryServiceFactory;
 import sonia.scm.repository.api.ScmProtocol;
 
+import javax.ws.rs.core.UriInfo;
 import java.net.URI;
 
 import static java.util.Arrays.asList;
@@ -49,6 +50,8 @@ public class RepositoryToRepositoryDtoMapperTest {
   private RepositoryService repositoryService;
   @Mock
   private UriInfoStore uriInfoStore;
+  @Mock
+  private UriInfo uriInfo;
 
   @InjectMocks
   private RepositoryToRepositoryDtoMapperImpl mapper;
@@ -59,6 +62,8 @@ public class RepositoryToRepositoryDtoMapperTest {
     when(serviceFactory.create(any(Repository.class))).thenReturn(repositoryService);
     when(repositoryService.isSupported(any(Command.class))).thenReturn(true);
     when(repositoryService.getSupportedProtocols()).thenReturn(emptySet());
+    when(uriInfoStore.get()).thenReturn(uriInfo);
+    when(uriInfo.getBaseUri()).thenReturn(URI.create("/x/y"));
   }
 
   @After