diff --git a/indexprovider/wrapper.go b/indexprovider/wrapper.go
index d507bdfab..2c6804ab7 100644
--- a/indexprovider/wrapper.go
+++ b/indexprovider/wrapper.go
@@ -35,7 +35,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
-	"github.com/multiformats/go-multicodec"
 	"go.uber.org/fx"
 )
 
@@ -171,9 +170,6 @@ func (w *Wrapper) AnnounceExtendedProviders(ctx context.Context) error {
 }
 
 func (w *Wrapper) appendExtendedProviders(ctx context.Context, adBuilder *xproviders.AdBuilder, key crypto.PrivKey) error {
-	// TODO: this will no longer be needed once metadata from go-libipni is being used
-	// metadata.Default will be usable instead of `metadataContext` for all below calls
-	metadataContext := metadata.Default.WithProtocol(multicodec.TransportIpfsGatewayHttp, func() metadata.Protocol { return &metadata.IpfsGatewayHttp{} })
 
 	if !w.bitswapEnabled {
 		// If bitswap is completely disabled, publish an advertisement with empty extended providers
@@ -184,7 +180,7 @@ func (w *Wrapper) appendExtendedProviders(ctx context.Context, adBuilder *xprovi
 		// we announce it as metadata on the main provider
 
 		// marshal bitswap metadata
-		meta := metadataContext.New(metadata.Bitswap{})
+		meta := metadata.Default.New(metadata.Bitswap{})
 		mbytes, err := meta.MarshalBinary()
 		if err != nil {
 			return err
@@ -240,7 +236,7 @@ func (w *Wrapper) appendExtendedProviders(ctx context.Context, adBuilder *xprovi
 		log.Info("Dealmaking.HTTPRetrievalMultiaddr is not set - announcing http disabled to Indexer")
 	} else {
 		// marshal http metadata
-		meta := metadataContext.New(metadata.IpfsGatewayHttp{})
+		meta := metadata.Default.New(metadata.IpfsGatewayHttp{})
 		mbytes, err := meta.MarshalBinary()
 		if err != nil {
 			return err