diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java b/spring-bus-core/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java
index 26c72f4b2..990c9c9e8 100644
--- a/spring-bus-core/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java
+++ b/spring-bus-core/src/main/java/org/springframework/bus/runner/config/RabbitServiceConfiguration.java
@@ -18,7 +18,8 @@ package org.springframework.bus.runner.config;
 
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.config.java.AbstractCloudConfig;
+import org.springframework.cloud.Cloud;
+import org.springframework.cloud.CloudFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
@@ -38,15 +39,16 @@ import org.springframework.xd.dirt.integration.rabbit.RabbitMessageBus;
 		"classpath*:/META-INF/spring-xd/analytics/rabbit-analytics.xml" })
 @PropertySource("classpath:/META-INF/spring-bus/rabbit-bus.properties")
 public class RabbitServiceConfiguration {
-
 	@Configuration
 	@Profile("cloud")
-	protected static class CloudConfig extends AbstractCloudConfig {
-
+	protected static class CloudConfig {
 		@Bean
-		ConnectionFactory rabbitConnectionFactory() {
-			return connectionFactory().rabbitConnectionFactory();
+		public Cloud cloud() {
+		  return new CloudFactory().getCloud();
+		}
+		@Bean
+		ConnectionFactory redisConnectionFactory(Cloud cloud) {
+			return cloud.getSingletonServiceConnector(ConnectionFactory.class, null);
 		}
 	}
-
 }
diff --git a/spring-bus-core/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java b/spring-bus-core/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java
index dd1036282..569d89494 100644
--- a/spring-bus-core/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java
+++ b/spring-bus-core/src/main/java/org/springframework/bus/runner/config/RedisServiceConfiguration.java
@@ -17,7 +17,8 @@
 package org.springframework.bus.runner.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.config.java.AbstractCloudConfig;
+import org.springframework.cloud.Cloud;
+import org.springframework.cloud.CloudFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
@@ -41,11 +42,14 @@ public class RedisServiceConfiguration {
 
 	@Configuration
 	@Profile("cloud")
-	protected static class CloudConfig extends AbstractCloudConfig {
-
+	protected static class CloudConfig {
 		@Bean
-		RedisConnectionFactory redisConnectionFactory() {
-			return connectionFactory().redisConnectionFactory();
+		public Cloud cloud() {
+		  return new CloudFactory().getCloud();
+		}
+		@Bean
+		RedisConnectionFactory redisConnectionFactory(Cloud cloud) {
+			return cloud.getSingletonServiceConnector(RedisConnectionFactory.class, null);
 		}
 	}
 
diff --git a/spring-xd-samples/pom.xml b/spring-xd-samples/pom.xml
index 5bfd7c1ef..d6cec4fa3 100644
--- a/spring-xd-samples/pom.xml
+++ b/spring-xd-samples/pom.xml
@@ -21,4 +21,17 @@
 		<module>tap</module>
 		<module>source-xml</module>
 	</modules>
+	<build>
+      <pluginManagement>
+		<plugins>
+			<plugin>
+				<!--skip deploy (this is just a test module) -->
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+        </plugins>
+      </pluginManagement>
+    </build>
 </project>