diff --git a/api/main.go b/api/main.go
index b8672745..c972200a 100644
--- a/api/main.go
+++ b/api/main.go
@@ -147,6 +147,7 @@ func main() {
 	prometheus.RegisterAt(app, "/metrics")
 	app.Use(prometheus.Middleware)
 
+	app.Use(cors.New())
 	app.Use(requestid.New())
 	app.Use(logger.New(logger.Config{
 		Format: "level=info timestamp=${time} method=${method} path=${path} status${status} request_id=${locals:requestid}\n",
@@ -155,9 +156,7 @@ func main() {
 	app.Get("/swagger.json", GetSwagger)
 
 	api := app.Group("/api/v1")
-	api.Use(cors.New()) // TODO CORS restrictions?
 	api.Use(middleware.ExtractPagination)
-
 	api.Get("/health", infrastructureCtrl.HealthCheck)
 	api.Get("/ready", infrastructureCtrl.ReadyCheck)
 
diff --git a/fly/main.go b/fly/main.go
index a556cab1..7e6e27e9 100644
--- a/fly/main.go
+++ b/fly/main.go
@@ -307,7 +307,7 @@ func main() {
 	vaaGossipConsumerSplitter.Start(rootCtx)
 
 	// start fly http server.
-	server := server.NewServer(logger, repository, sqsConsumer, *isLocal)
+	server := server.NewServer(logger, repository, sqsConsumer, *isLocal, true)
 	server.Start()
 
 	go func() {
diff --git a/fly/server/server.go b/fly/server/server.go
index 5d5dfec6..d5be98a4 100644
--- a/fly/server/server.go
+++ b/fly/server/server.go
@@ -5,6 +5,7 @@ import (
 
 	"github.com/gofiber/fiber/v2"
 	fiberLog "github.com/gofiber/fiber/v2/middleware/logger"
+	"github.com/gofiber/fiber/v2/middleware/pprof"
 	"github.com/wormhole-foundation/wormhole-explorer/fly/internal/sqs"
 	"github.com/wormhole-foundation/wormhole-explorer/fly/storage"
 	"go.uber.org/zap"
@@ -16,13 +17,17 @@ type Server struct {
 	logger *zap.Logger
 }
 
-func NewServer(logger *zap.Logger, repository *storage.Repository, consumer *sqs.Consumer, isLocal bool) *Server {
+func NewServer(logger *zap.Logger, repository *storage.Repository, consumer *sqs.Consumer, isLocal, pprofEnabled bool) *Server {
 	port := os.Getenv("API_PORT")
 	if port == "" {
 		logger.Fatal("You must set your 'API_PORT' environmental variable")
 	}
 	ctrl := NewController(repository, consumer, isLocal)
 	app := fiber.New()
+	// config use of middlware.
+	if pprofEnabled {
+		app.Use(pprof.New())
+	}
 	app.Use(fiberLog.New(fiberLog.Config{
 		Format: "level=info timestamp=${time} method=${method} path=${path} status${status} request_id=${locals:requestid}\n",
 	}))