diff --git a/integration/docker_compose_test.go b/integration/docker_compose_test.go
index d499d2258..8fd14405a 100644
--- a/integration/docker_compose_test.go
+++ b/integration/docker_compose_test.go
@@ -77,7 +77,7 @@ func (s *DockerComposeSuite) TestComposeScale(c *check.C) {
 	services := rtconf.Services
 	c.Assert(services, checker.HasLen, 1)
 	for k, v := range services {
-		c.Assert(k, checker.Equals, composeService+"_integrationtest"+composeProject+"@docker")
+		c.Assert(k, checker.Equals, composeService+"-integrationtest"+composeProject+"@docker")
 		c.Assert(v.LoadBalancer.Servers, checker.HasLen, serviceCount)
 		// We could break here, but we don't just to keep us honest.
 	}
diff --git a/pkg/provider/docker/config.go b/pkg/provider/docker/config.go
index b0aeb4c5f..b2385a7e6 100644
--- a/pkg/provider/docker/config.go
+++ b/pkg/provider/docker/config.go
@@ -331,5 +331,5 @@ func getServiceName(container dockerData) string {
 		serviceName = values[labelDockerComposeService] + "_" + values[labelDockerComposeProject]
 	}
 
-	return serviceName
+	return provider.Normalize(serviceName)
 }
diff --git a/pkg/provider/docker/docker.go b/pkg/provider/docker/docker.go
index 901ba9d5d..534ee47c7 100644
--- a/pkg/provider/docker/docker.go
+++ b/pkg/provider/docker/docker.go
@@ -142,7 +142,12 @@ func (p *Provider) createClient() (client.APIClient, error) {
 		apiVersion = SwarmAPIVersion
 	}
 
-	return client.NewClient(p.Endpoint, apiVersion, httpClient, httpHeaders)
+	return client.NewClientWithOpts(
+		client.WithHost(p.Endpoint),
+		client.WithVersion(apiVersion),
+		client.WithHTTPClient(httpClient),
+		client.WithHTTPHeaders(httpHeaders),
+	)
 }
 
 // Provide allows the docker provider to provide configurations to traefik using the given configuration channel.