diff --git a/node/cmd/main.go b/node/cmd/main.go
index 1fe3a9564c..00b959213d 100644
--- a/node/cmd/main.go
+++ b/node/cmd/main.go
@@ -8,12 +8,13 @@ import (
 	"time"
 
 	"github.com/Layr-Labs/eigenda/common/pubip"
+	"github.com/Layr-Labs/eigenda/common/ratelimit"
+	"github.com/Layr-Labs/eigenda/common/store"
+	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/urfave/cli"
 
 	"github.com/Layr-Labs/eigenda/common"
-	"github.com/Layr-Labs/eigenda/common/ratelimit"
-	"github.com/Layr-Labs/eigenda/common/store"
 	"github.com/Layr-Labs/eigenda/node"
 	"github.com/Layr-Labs/eigenda/node/flags"
 	"github.com/Layr-Labs/eigenda/node/grpc"
@@ -56,18 +57,8 @@ func NodeMain(ctx *cli.Context) error {
 
 	pubIPProvider := pubip.ProviderOrDefault(config.PubIPProvider)
 
-	// Create the node.
-	node, err := node.NewNode(config, pubIPProvider, logger)
-	if err != nil {
-		return err
-	}
-
-	err = node.Start(context.Background())
-	if err != nil {
-		node.Logger.Error("could not start node", "error", err)
-		return err
-	}
-
+	// Rate limiter
+	reg := prometheus.NewRegistry()
 	globalParams := common.GlobalRateParams{
 		BucketSizes: []time.Duration{bucketDuration},
 		Multipliers: []float32{bucketMultiplier},
@@ -79,7 +70,19 @@ func NodeMain(ctx *cli.Context) error {
 		return err
 	}
 
-	ratelimiter := ratelimit.NewRateLimiter(globalParams, bucketStore, logger)
+	ratelimiter := ratelimit.NewRateLimiter(reg, globalParams, bucketStore, logger)
+
+	// Create the node.
+	node, err := node.NewNode(reg, config, pubIPProvider, logger)
+	if err != nil {
+		return err
+	}
+
+	err = node.Start(context.Background())
+	if err != nil {
+		node.Logger.Error("could not start node", "error", err)
+		return err
+	}
 
 	// Creates the GRPC server.
 	server := grpc.NewServer(config, node, logger, ratelimiter)
diff --git a/node/node.go b/node/node.go
index 010b76cf6d..d80e64e0ed 100644
--- a/node/node.go
+++ b/node/node.go
@@ -61,16 +61,15 @@ type Node struct {
 }
 
 // NewNode creates a new Node with the provided config.
-func NewNode(config *Config, pubIPProvider pubip.Provider, logger logging.Logger) (*Node, error) {
+func NewNode(reg *prometheus.Registry, config *Config, pubIPProvider pubip.Provider, logger logging.Logger) (*Node, error) {
 	// Setup metrics
 	// sdkClients, err := buildSdkClients(config, logger)
 	// if err != nil {
 	// 	return nil, err
 	// }
 
-	promReg := prometheus.NewRegistry()
-	eigenMetrics := metrics.NewEigenMetrics(AppName, ":"+config.MetricsPort, promReg, logger.With("component", "EigenMetrics"))
-	rpcCallsCollector := rpccalls.NewCollector(AppName, promReg)
+	eigenMetrics := metrics.NewEigenMetrics(AppName, ":"+config.MetricsPort, reg, logger.With("component", "EigenMetrics"))
+	rpcCallsCollector := rpccalls.NewCollector(AppName, reg)
 
 	// Generate BLS keys
 	keyPair, err := core.MakeKeyPairFromString(config.PrivateBls)
@@ -108,7 +107,7 @@ func NewNode(config *Config, pubIPProvider pubip.Provider, logger logging.Logger
 	// Setup Node Api
 	nodeApi := nodeapi.NewNodeApi(AppName, SemVer, ":"+config.NodeApiPort, logger.With("component", "NodeApi"))
 
-	metrics := NewMetrics(eigenMetrics, promReg, logger, ":"+config.MetricsPort, config.ID, config.OnchainMetricsInterval, tx, cst)
+	metrics := NewMetrics(eigenMetrics, reg, logger, ":"+config.MetricsPort, config.ID, config.OnchainMetricsInterval, tx, cst)
 
 	// Make validator
 	v, err := verifier.NewVerifier(&config.EncoderConfig, false)