diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/book-service.properties b/spring-cloud/spring-cloud-bootstrap/application-config/book-service.properties
index e1244a0cf0..49f7d1ed91 100644
--- a/spring-cloud/spring-cloud-bootstrap/application-config/book-service.properties
+++ b/spring-cloud/spring-cloud-bootstrap/application-config/book-service.properties
@@ -15,3 +15,6 @@ logging.level.org.springframework.security=debug
 
 spring.redis.host=localhost
 spring.redis.port=6379
+
+spring.sleuth.sampler.percentage=1.0
+spring.sleuth.web.skipPattern=(^cleanup.*)
diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/gateway.properties b/spring-cloud/spring-cloud-bootstrap/application-config/gateway.properties
index 09f7f3bf4a..e2686ae64c 100644
--- a/spring-cloud/spring-cloud-bootstrap/application-config/gateway.properties
+++ b/spring-cloud/spring-cloud-bootstrap/application-config/gateway.properties
@@ -24,4 +24,8 @@ logging.level.org.springframework.security=debug
 logging.level.org.springframework.cloud.netflix.zuul=debug
 
 spring.redis.host=localhost
-spring.redis.port=6379
\ No newline at end of file
+spring.redis.port=6379
+
+spring.sleuth.sampler.percentage=1.0
+spring.sleuth.web.skipPattern=(^cleanup.*|.+favicon.*)
+spring.zipkin.base-url=http://zipkin
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-bootstrap/application-config/rating-service.properties b/spring-cloud/spring-cloud-bootstrap/application-config/rating-service.properties
index 4817d12c83..b7cbb6fbd6 100644
--- a/spring-cloud/spring-cloud-bootstrap/application-config/rating-service.properties
+++ b/spring-cloud/spring-cloud-bootstrap/application-config/rating-service.properties
@@ -15,3 +15,6 @@ logging.level.org.springframework.security=debug
 
 spring.redis.host=localhost
 spring.redis.port=6379
+
+spring.sleuth.sampler.percentage=1.0
+spring.sleuth.web.skipPattern=(^cleanup.*)
diff --git a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties
index 5756b8205a..43491ff36b 100644
--- a/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties
+++ b/spring-cloud/spring-cloud-bootstrap/gateway/src/main/resources/bootstrap.properties
@@ -4,12 +4,4 @@ spring.cloud.config.discovery.enabled=true
 spring.cloud.config.username=configUser
 spring.cloud.config.password=configPassword
 
-eureka.client.serviceUrl.defaultZone=http://discUser:discPassword@localhost:8082/eureka/
-
-zuul.routes.zipkin.path=/zipkin/**
-zuul.routes.zipkin.sensitive-headers=Set-Cookie,Authorization
-hystrix.command.zipkin.execution.isolation.thread.timeoutInMilliseconds=600000
-
-spring.sleuth.sampler.percentage=1.0
-spring.sleuth.web.skipPattern=(^cleanup.*|.+favicon.*)
-spring.zipkin.base-url=http://zipkin
\ No newline at end of file
+eureka.client.serviceUrl.defaultZone=http://discUser:discPassword@localhost:8082/eureka/
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties
index f183ee9156..481cdc182c 100644
--- a/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties
+++ b/spring-cloud/spring-cloud-bootstrap/svc-book/src/main/resources/bootstrap.properties
@@ -4,8 +4,4 @@ spring.cloud.config.discovery.enabled=true
 spring.cloud.config.username=configUser
 spring.cloud.config.password=configPassword
 
-eureka.client.serviceUrl.defaultZone=http://discUser:discPassword@localhost:8082/eureka/
-
-spring.sleuth.sampler.percentage=1.0
-spring.sleuth.web.skipPattern=(^cleanup.*)
-spring.zipkin.locator.discovery.enabled=true
\ No newline at end of file
+eureka.client.serviceUrl.defaultZone=http://discUser:discPassword@localhost:8082/eureka/
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties
index ccbd6eeffe..be5cf7f1e1 100644
--- a/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties
+++ b/spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/resources/bootstrap.properties
@@ -5,6 +5,3 @@ spring.cloud.config.username=configUser
 spring.cloud.config.password=configPassword
 
 eureka.client.serviceUrl.defaultZone=http://discUser:discPassword@localhost:8082/eureka/
-
-spring.sleuth.sampler.percentage=1.0
-spring.sleuth.web.skipPattern=(^cleanup.*)