diff --git a/app/client/cli/debug.go b/app/client/cli/debug.go
index e96285edb..864f391cb 100644
--- a/app/client/cli/debug.go
+++ b/app/client/cli/debug.go
@@ -5,6 +5,10 @@ import (
 	"os"
 
 	"github.com/manifoldco/promptui"
+	"github.com/spf13/cobra"
+	"google.golang.org/protobuf/types/known/anypb"
+
+	"github.com/pokt-network/pocket/libp2p"
 	"github.com/pokt-network/pocket/logger"
 	"github.com/pokt-network/pocket/p2p"
 	"github.com/pokt-network/pocket/p2p/providers/addrbook_provider"
@@ -16,8 +20,6 @@ import (
 	"github.com/pokt-network/pocket/runtime/defaults"
 	"github.com/pokt-network/pocket/shared/messaging"
 	"github.com/pokt-network/pocket/shared/modules"
-	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/types/known/anypb"
 )
 
 // TECHDEBT: Lowercase variables / constants that do not need to be exported.
@@ -101,11 +103,13 @@ func NewDebugCommand() *cobra.Command {
 			modulesRegistry.RegisterModule(currentHeightProvider)
 
 			setValueInCLIContext(cmd, busCLICtxKey, bus)
-			p2pM, err := p2p.Create(bus)
+
+			// TECHDEBT: simplify after P2P module consolidation.
+			var err error
+			p2pMod, err = getP2PModule(runtimeMgr)
 			if err != nil {
 				logger.Global.Fatal().Err(err).Msg("Failed to create p2p module")
 			}
-			p2pMod = p2pM.(modules.P2PModule)
 
 			if err := p2pMod.Start(); err != nil {
 				logger.Global.Fatal().Err(err).Msg("Failed to start p2p module")
@@ -271,3 +275,19 @@ func fetchAddressBook(cmd *cobra.Command) (types.AddrBook, error) {
 	}
 	return addrBook, err
 }
+
+func getP2PModule(runtimeMgr *runtime.Manager) (p2pModule modules.P2PModule, err error) {
+	bus := runtimeMgr.GetBus()
+
+	var mod modules.Module
+	if runtimeMgr.GetConfig().UseLibP2P {
+		mod, err = libp2p.Create(bus)
+	} else {
+		mod, err = p2p.Create(bus)
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	return mod.(modules.P2PModule), nil
+}
diff --git a/app/client/doc/CHANGELOG.md b/app/client/doc/CHANGELOG.md
index a2b7ca01d..7a2d660f2 100644
--- a/app/client/doc/CHANGELOG.md
+++ b/app/client/doc/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.0.20] - 2023-03-03
+
+- Support libp2p module in debug CLI
+
 ## [0.0.0.19] - 2023-02-28
 
 - Renamed the package names for some basic helpers
diff --git a/shared/CHANGELOG.md b/shared/CHANGELOG.md
index 94ba3c941..10fdc0307 100644
--- a/shared/CHANGELOG.md
+++ b/shared/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.0.38] - 2023-03-03
+
+- Support libp2p module in node
+
 ## [0.0.0.37] - 2023-03-01
 
 - add pokt --> libp2p crypto helpers
diff --git a/shared/node.go b/shared/node.go
index 66c533aeb..67b39171c 100644
--- a/shared/node.go
+++ b/shared/node.go
@@ -2,6 +2,7 @@ package shared
 
 import (
 	"github.com/pokt-network/pocket/consensus"
+	"github.com/pokt-network/pocket/libp2p"
 	"github.com/pokt-network/pocket/logger"
 	"github.com/pokt-network/pocket/p2p"
 	"github.com/pokt-network/pocket/persistence"
@@ -33,6 +34,13 @@ func CreateNode(bus modules.Bus, options ...modules.ModuleOption) (modules.Modul
 }
 
 func (m *Node) Create(bus modules.Bus, options ...modules.ModuleOption) (modules.Module, error) {
+	// TECHDEBT: simplify after P2P module consolidation.
+	useLibP2P := bus.GetRuntimeMgr().GetConfig().UseLibP2P
+	p2pCreate := p2p.Create
+	if useLibP2P {
+		p2pCreate = libp2p.Create
+	}
+
 	for _, mod := range []func(modules.Bus, ...modules.ModuleOption) (modules.Module, error){
 		state_machine.Create,
 		persistence.Create,
@@ -41,7 +49,7 @@ func (m *Node) Create(bus modules.Bus, options ...modules.ModuleOption) (modules
 		telemetry.Create,
 		logger.Create,
 		rpc.Create,
-		p2p.Create,
+		p2pCreate,
 	} {
 		if _, err := mod(bus); err != nil {
 			return nil, err