diff --git a/internal/bootstrap/app_bootstrap.go b/internal/bootstrap/app_bootstrap.go
index 54838d1..4401172 100644
--- a/internal/bootstrap/app_bootstrap.go
+++ b/internal/bootstrap/app_bootstrap.go
@@ -148,9 +148,6 @@ func (app *BootstrapApp) Setup() error {
 		gin.SetMode(gin.ReleaseMode)
 	}
 
-	router := engine.Group("/")
-	apiRouter := router.Group("/api")
-
 	// Create middlewares
 	var middlewares []Middleware
 
@@ -169,9 +166,13 @@ func (app *BootstrapApp) Setup() error {
 		if err != nil {
 			return fmt.Errorf("failed to initialize %s middleware: %T", middleware, err)
 		}
-		router.Use(middleware.Middleware())
+		engine.Use(middleware.Middleware())
 	}
 
+	// Create routers
+	mainRouter := engine.Group("/")
+	apiRouter := engine.Group("/api")
+
 	// Create controllers
 	contextController := controller.NewContextController(controller.ContextControllerConfig{
 		ConfiguredProviders:   configuredProviders,
@@ -201,7 +202,7 @@ func (app *BootstrapApp) Setup() error {
 
 	resourcesController := controller.NewResourcesController(controller.ResourcesControllerConfig{
 		ResourcesDir: app.Config.ResourcesDir,
-	}, router)
+	}, mainRouter)
 
 	healthController := controller.NewHealthController(apiRouter)
 
diff --git a/internal/controller/proxy_controller.go b/internal/controller/proxy_controller.go
index 9515d32..ae7a101 100644
--- a/internal/controller/proxy_controller.go
+++ b/internal/controller/proxy_controller.go
@@ -38,7 +38,7 @@ func NewProxyController(config ProxyControllerConfig, router *gin.RouterGroup, d
 }
 
 func (controller *ProxyController) SetupRoutes() {
-	proxyGroup := controller.Router.Group("/api/auth")
+	proxyGroup := controller.Router.Group("/auth")
 	proxyGroup.GET("/:proxy", controller.proxyHandler)
 }
 
diff --git a/internal/service/docker_service.go b/internal/service/docker_service.go
index 448a974..41eb07c 100644
--- a/internal/service/docker_service.go
+++ b/internal/service/docker_service.go
@@ -30,6 +30,9 @@ func (docker *DockerService) Init() error {
 
 	ctx := context.Background()
 	client.NegotiateAPIVersion(ctx)
+
+	docker.Client = client
+	docker.Context = ctx
 	return nil
 }