diff --git a/aws-lambda-router/cmd/main.go b/aws-lambda-router/cmd/main.go
index 04f850e9e0..8980ba6ec1 100644
--- a/aws-lambda-router/cmd/main.go
+++ b/aws-lambda-router/cmd/main.go
@@ -62,13 +62,13 @@ func main() {
 
 	// If HTTP_PORT is set, we assume we are running the router without lambda
 	if httpPort != "" {
-		if err := svr.Server().ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
+		if err := svr.HttpServer().ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			logger.Fatal("Could not start server", zap.Error(err))
 		}
 		return
 	}
 
-	lambdaHandler := algnhsa.New(svr.Server().Handler, nil)
+	lambdaHandler := algnhsa.New(svr.HttpServer().Handler, nil)
 	lambda.StartWithOptions(lambdaHandler,
 		lambda.WithContext(ctx),
 		// Registered an internal extensions which gives us 500ms to shutdown
diff --git a/aws-lambda-router/internal/router_test.go b/aws-lambda-router/internal/router_test.go
index e67d47bc52..5fa05da980 100644
--- a/aws-lambda-router/internal/router_test.go
+++ b/aws-lambda-router/internal/router_test.go
@@ -24,7 +24,7 @@ func TestHandler(t *testing.T) {
 	svr, err := r.NewServer(context.Background())
 	require.NoError(t, err)
 
-	handler := algnhsa.New(svr.Server().Handler, &algnhsa.Options{
+	handler := algnhsa.New(svr.HttpServer().Handler, &algnhsa.Options{
 		RequestType: algnhsa.RequestTypeAPIGatewayV2,
 	})
 	j, err := json.Marshal(events.APIGatewayV2HTTPRequest{
diff --git a/router-tests/testenv/testenv.go b/router-tests/testenv/testenv.go
index 937b19df1e..4f105d502e 100644
--- a/router-tests/testenv/testenv.go
+++ b/router-tests/testenv/testenv.go
@@ -264,7 +264,7 @@ func createTestEnv(t testing.TB, cfg *Config) (*Environment, error) {
 	require.NoError(t, err)
 
 	go func() {
-		if err := svr.Server().ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
+		if err := svr.HttpServer().ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
 			t.Errorf("could not start router: %s", err)
 		}
 	}()
diff --git a/router/core/router.go b/router/core/router.go
index 22d422679d..de036465de 100644
--- a/router/core/router.go
+++ b/router/core/router.go
@@ -128,7 +128,7 @@ type (
 	}
 
 	Server interface {
-		Server() *http.Server
+		HttpServer() *http.Server
 		HealthChecks() health.Checker
 	}
 
@@ -1072,7 +1072,7 @@ func (r *server) HealthChecks() health.Checker {
 	return r.healthChecks
 }
 
-func (r *server) Server() *http.Server {
+func (r *server) HttpServer() *http.Server {
 	return r.server
 }