diff --git a/libnetwork/drivers/overlay/overlay_test.go b/libnetwork/drivers/overlay/overlay_test.go
index 87d1c8d8a3..755ea3fad0 100644
--- a/libnetwork/drivers/overlay/overlay_test.go
+++ b/libnetwork/drivers/overlay/overlay_test.go
@@ -49,8 +49,8 @@ func setupDriver(t *testing.T) *driverTester {
 	}
 	defaultPrefix := filepath.Join(os.TempDir(), "libnetwork", "test", "overlay")
 
-	config[netlabel.GlobalKVClient] = discoverapi.DatastoreConfigData{
-		Scope:    datastore.GlobalScope,
+	config[netlabel.LocalKVClient] = discoverapi.DatastoreConfigData{
+		Scope:    datastore.LocalScope,
 		Provider: "boltdb",
 		Address:  filepath.Join(defaultPrefix, filepath.Base(tmp.Name())),
 		Config: &store.Config{
diff --git a/libnetwork/netlabel/labels.go b/libnetwork/netlabel/labels.go
index 89d6eb127c..2885addaa6 100644
--- a/libnetwork/netlabel/labels.go
+++ b/libnetwork/netlabel/labels.go
@@ -47,47 +47,6 @@ const (
 	// HostIP is the Source-IP Address used to SNAT container traffic
 	HostIP = Prefix + ".host_ipv4"
 
-	// GlobalKVProvider constant represents the KV provider backend
-	GlobalKVProvider = DriverPrivatePrefix + "globalkv_provider"
-
-	// GlobalKVProviderURL constant represents the KV provider URL
-	GlobalKVProviderURL = DriverPrivatePrefix + "globalkv_provider_url"
-
-	// GlobalKVProviderConfig constant represents the KV provider Config
-	GlobalKVProviderConfig = DriverPrivatePrefix + "globalkv_provider_config"
-
-	// GlobalKVClient constants represents the global kv store client
-	GlobalKVClient = DriverPrivatePrefix + "globalkv_client"
-
-	// LocalKVProvider constant represents the KV provider backend
-	LocalKVProvider = DriverPrivatePrefix + "localkv_provider"
-
-	// LocalKVProviderURL constant represents the KV provider URL
-	LocalKVProviderURL = DriverPrivatePrefix + "localkv_provider_url"
-
-	// LocalKVProviderConfig constant represents the KV provider Config
-	LocalKVProviderConfig = DriverPrivatePrefix + "localkv_provider_config"
-
 	// LocalKVClient constants represents the local kv store client
 	LocalKVClient = DriverPrivatePrefix + "localkv_client"
 )
-
-// MakeKVProvider returns the kvprovider label for the scope
-func MakeKVProvider(scope string) string {
-	return DriverPrivatePrefix + scope + "kv_provider"
-}
-
-// MakeKVProviderURL returns the kvprovider url label for the scope
-func MakeKVProviderURL(scope string) string {
-	return DriverPrivatePrefix + scope + "kv_provider_url"
-}
-
-// MakeKVProviderConfig returns the kvprovider config label for the scope
-func MakeKVProviderConfig(scope string) string {
-	return DriverPrivatePrefix + scope + "kv_provider_config"
-}
-
-// MakeKVClient returns the kv client label for the scope
-func MakeKVClient(scope string) string {
-	return DriverPrivatePrefix + scope + "kv_client"
-}