diff --git a/pkg/provider/consulcatalog/consul_catalog.go b/pkg/provider/consulcatalog/consul_catalog.go
index 3f0815f1a089458b94ca77c0b1d37079bf392681..af8c7e2f7737192587e422a48a587af8859d11b8 100644
--- a/pkg/provider/consulcatalog/consul_catalog.go
+++ b/pkg/provider/consulcatalog/consul_catalog.go
@@ -233,12 +233,12 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 		}
 
 		notify := func(err error, time time.Duration) {
-			logger.Error().Err(err).Msgf("Provider connection error, retrying in %s", time)
+			logger.Error().Err(err).Msgf("Provider error, retrying in %s", time)
 		}
 
 		err := backoff.RetryNotify(safe.OperationWithRecover(operation), backoff.WithContext(job.NewBackOff(backoff.NewExponentialBackOff()), ctxLog), notify)
 		if err != nil {
-			logger.Error().Err(err).Msg("Cannot connect to consul catalog server")
+			logger.Error().Err(err).Msg("Cannot retrieve data")
 		}
 	})
 
diff --git a/pkg/provider/docker/docker.go b/pkg/provider/docker/docker.go
index eefd737ad776e78425bd6a92aee7efe0973c2b64..2e902cf8aafe97a92493c196dc3c414a16d3edaa 100644
--- a/pkg/provider/docker/docker.go
+++ b/pkg/provider/docker/docker.go
@@ -329,11 +329,11 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 		}
 
 		notify := func(err error, time time.Duration) {
-			logger.Error().Err(err).Msgf("Provider connection error, retrying in %s", time)
+			logger.Error().Err(err).Msgf("Provider error, retrying in %s", time)
 		}
 		err := backoff.RetryNotify(safe.OperationWithRecover(operation), backoff.WithContext(job.NewBackOff(backoff.NewExponentialBackOff()), ctxLog), notify)
 		if err != nil {
-			logger.Error().Err(err).Msg("Cannot connect to docker server")
+			logger.Error().Err(err).Msg("Cannot retrieve data")
 		}
 	})
 
diff --git a/pkg/provider/ecs/ecs.go b/pkg/provider/ecs/ecs.go
index ac78b5d6f78d8f8f64637caf48e57e6dcdf5c458..22e3e5695d2445a925e772a679564cae09691ac3 100644
--- a/pkg/provider/ecs/ecs.go
+++ b/pkg/provider/ecs/ecs.go
@@ -183,11 +183,11 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 		}
 
 		notify := func(err error, time time.Duration) {
-			logger.Error().Err(err).Msgf("Provider connection error, retrying in %s", time)
+			logger.Error().Err(err).Msgf("Provider error, retrying in %s", time)
 		}
 		err := backoff.RetryNotify(safe.OperationWithRecover(operation), backoff.WithContext(job.NewBackOff(backoff.NewExponentialBackOff()), routineCtx), notify)
 		if err != nil {
-			logger.Error().Err(err).Msg("Cannot connect to Provider api")
+			logger.Error().Err(err).Msg("Cannot retrieve data")
 		}
 	})
 
diff --git a/pkg/provider/http/http.go b/pkg/provider/http/http.go
index 776c9de1b2986edc18ddbb02d62b0de27b6c7a75..e8ad5b8e7b4ea67fbdc63fb6d74bf0fb235c3f63 100644
--- a/pkg/provider/http/http.go
+++ b/pkg/provider/http/http.go
@@ -97,11 +97,11 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 		}
 
 		notify := func(err error, time time.Duration) {
-			logger.Error().Err(err).Msgf("Provider connection error, retrying in %s", time)
+			logger.Error().Err(err).Msgf("Provider error, retrying in %s", time)
 		}
 		err := backoff.RetryNotify(safe.OperationWithRecover(operation), backoff.WithContext(job.NewBackOff(backoff.NewExponentialBackOff()), ctxLog), notify)
 		if err != nil {
-			logger.Error().Err(err).Msg("Cannot connect to server endpoint")
+			logger.Error().Err(err).Msg("Cannot retrieve data")
 		}
 	})
 
diff --git a/pkg/provider/http/http_test.go b/pkg/provider/http/http_test.go
index 7a0477dd02064508a45f512e1aa72c3e897078c5..97f020c3bca098d2d4d3a793e50269ad9c820327 100644
--- a/pkg/provider/http/http_test.go
+++ b/pkg/provider/http/http_test.go
@@ -146,7 +146,7 @@ func TestProvider_decodeConfiguration(t *testing.T) {
 		},
 		{
 			desc:       "should return the decoded dynamic configuration",
-			configData: []byte("{\"tcp\":{\"routers\":{\"foo\":{}}}}"),
+			configData: []byte(`{"tcp":{"routers":{"foo":{}}}}`),
 			expConfig: &dynamic.Configuration{
 				HTTP: &dynamic.HTTPConfiguration{
 					Routers:           make(map[string]*dynamic.Router),
diff --git a/pkg/provider/kubernetes/crd/kubernetes.go b/pkg/provider/kubernetes/crd/kubernetes.go
index 299f3f803db7c600db1a593a481cacb843a4046b..f2054d09eda09f4f2fa12f7d31687a52b75f76da 100644
--- a/pkg/provider/kubernetes/crd/kubernetes.go
+++ b/pkg/provider/kubernetes/crd/kubernetes.go
@@ -168,11 +168,11 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 		}
 
 		notify := func(err error, time time.Duration) {
-			logger.Error().Err(err).Msgf("Provider connection error, retrying in %s", time)
+			logger.Error().Err(err).Msgf("Provider error, retrying in %s", time)
 		}
 		err := backoff.RetryNotify(safe.OperationWithRecover(operation), backoff.WithContext(job.NewBackOff(backoff.NewExponentialBackOff()), ctxPool), notify)
 		if err != nil {
-			logger.Error().Err(err).Msg("Cannot connect to Provider")
+			logger.Error().Err(err).Msg("Cannot retrieve data")
 		}
 	})
 
diff --git a/pkg/provider/kubernetes/gateway/kubernetes.go b/pkg/provider/kubernetes/gateway/kubernetes.go
index f06bdac9b4435f3c3d7c167916f3d5cebbfc57df..3f62e98a2c529e72537354763e2ff69131a5b329 100644
--- a/pkg/provider/kubernetes/gateway/kubernetes.go
+++ b/pkg/provider/kubernetes/gateway/kubernetes.go
@@ -162,11 +162,11 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 		}
 
 		notify := func(err error, time time.Duration) {
-			logger.Error().Err(err).Msgf("Provider connection error, retrying in %s", time)
+			logger.Error().Err(err).Msgf("Provider error, retrying in %s", time)
 		}
 		err := backoff.RetryNotify(safe.OperationWithRecover(operation), backoff.WithContext(job.NewBackOff(backoff.NewExponentialBackOff()), ctxPool), notify)
 		if err != nil {
-			logger.Error().Err(err).Msg("Cannot connect to Provider")
+			logger.Error().Err(err).Msg("Cannot retrieve data")
 		}
 	})
 
diff --git a/pkg/provider/kubernetes/ingress/kubernetes.go b/pkg/provider/kubernetes/ingress/kubernetes.go
index 206f37d504997c6134f212b397543dd72556993f..95a71c12d671e188ea94228e8288ce561cd77f12 100644
--- a/pkg/provider/kubernetes/ingress/kubernetes.go
+++ b/pkg/provider/kubernetes/ingress/kubernetes.go
@@ -169,12 +169,12 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 		}
 
 		notify := func(err error, time time.Duration) {
-			logger.Error().Err(err).Msgf("Provider connection error, retrying in %s", time)
+			logger.Error().Err(err).Msgf("Provider error, retrying in %s", time)
 		}
 
 		err := backoff.RetryNotify(safe.OperationWithRecover(operation), backoff.WithContext(job.NewBackOff(backoff.NewExponentialBackOff()), ctxPool), notify)
 		if err != nil {
-			logger.Error().Err(err).Msg("Cannot connect to Provider")
+			logger.Error().Err(err).Msg("Cannot retrieve data")
 		}
 	})
 
diff --git a/pkg/provider/kv/kv.go b/pkg/provider/kv/kv.go
index abc25a84d13a6651ade0b94d2898f85f64663972..f6697b82193a85a56adbb04cf8d4e4950d1f34e1 100644
--- a/pkg/provider/kv/kv.go
+++ b/pkg/provider/kv/kv.go
@@ -85,7 +85,7 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 
 		err := p.watchKv(ctxLog, configurationChan)
 		if err != nil {
-			logger.Error().Err(err).Msg("Cannot watch KV store")
+			logger.Error().Err(err).Msg("Cannot retrieve data")
 		}
 	})
 
@@ -124,15 +124,11 @@ func (p *Provider) watchKv(ctx context.Context, configurationChan chan<- dynamic
 	}
 
 	notify := func(err error, time time.Duration) {
-		log.Ctx(ctx).Error().Err(err).Msgf("KV connection error, retrying in %s", time)
+		log.Ctx(ctx).Error().Err(err).Msgf("Provider error, retrying in %s", time)
 	}
 
-	err := backoff.RetryNotify(safe.OperationWithRecover(operation),
+	return backoff.RetryNotify(safe.OperationWithRecover(operation),
 		backoff.WithContext(job.NewBackOff(backoff.NewExponentialBackOff()), ctx), notify)
-	if err != nil {
-		return fmt.Errorf("cannot connect to KV server: %w", err)
-	}
-	return nil
 }
 
 func (p *Provider) buildConfiguration(ctx context.Context) (*dynamic.Configuration, error) {
diff --git a/pkg/provider/marathon/marathon.go b/pkg/provider/marathon/marathon.go
index 423573e66ffec8472b9eb2f8f35bbc40a415722b..d4e8cccd83765aec81ee53d46326604a1dc2f617 100644
--- a/pkg/provider/marathon/marathon.go
+++ b/pkg/provider/marathon/marathon.go
@@ -192,11 +192,11 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 	}
 
 	notify := func(err error, time time.Duration) {
-		logger.Error().Err(err).Msgf("Provider connection error, retrying in %s", time)
+		logger.Error().Err(err).Msgf("Provider error, retrying in %s", time)
 	}
 	err := backoff.RetryNotify(safe.OperationWithRecover(operation), backoff.WithContext(job.NewBackOff(backoff.NewExponentialBackOff()), ctx), notify)
 	if err != nil {
-		logger.Error().Err(err).Msg("Cannot connect to Provider server")
+		logger.Error().Err(err).Msg("Cannot retrieve data")
 	}
 	return nil
 }
diff --git a/pkg/provider/rancher/rancher.go b/pkg/provider/rancher/rancher.go
index 8f74dcc21f6da5f9cd7001cfb1b3459d7998f3b6..212c6607c648973e2e6554e5c9011f14fdf39311 100644
--- a/pkg/provider/rancher/rancher.go
+++ b/pkg/provider/rancher/rancher.go
@@ -140,11 +140,11 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 		}
 
 		notify := func(err error, time time.Duration) {
-			logger.Error().Err(err).Msgf("Provider connection error, retrying in %s", time)
+			logger.Error().Err(err).Msgf("Provider error, retrying in %s", time)
 		}
 		err := backoff.RetryNotify(safe.OperationWithRecover(operation), backoff.WithContext(job.NewBackOff(backoff.NewExponentialBackOff()), ctxLog), notify)
 		if err != nil {
-			logger.Error().Err(err).Msg("Cannot connect to Provider server")
+			logger.Error().Err(err).Msg("Cannot retrieve data")
 		}
 	})