diff --git a/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/firestore/GcpFirestoreAutoConfiguration.java b/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/firestore/GcpFirestoreAutoConfiguration.java
index a5821944b8..e6f239bed2 100644
--- a/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/firestore/GcpFirestoreAutoConfiguration.java
+++ b/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/firestore/GcpFirestoreAutoConfiguration.java
@@ -154,7 +154,7 @@ public ReactiveFirestoreTransactionManager firestoreTransactionManager(
 		@ConditionalOnMissingBean
 		public ManagedChannel firestoreManagedChannel() {
 			return ManagedChannelBuilder
-					.forTarget(GcpFirestoreAutoConfiguration.this.hostPort)
+					.forTarget("dns:///" + GcpFirestoreAutoConfiguration.this.hostPort)
 					.userAgent(USER_AGENT_HEADER_PROVIDER.getUserAgent())
 					.build();
 		}
diff --git a/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/pubsub/GcpPubSubEmulatorAutoConfiguration.java b/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/pubsub/GcpPubSubEmulatorAutoConfiguration.java
index 655d71cd18..bbf40cb9c5 100644
--- a/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/pubsub/GcpPubSubEmulatorAutoConfiguration.java
+++ b/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/pubsub/GcpPubSubEmulatorAutoConfiguration.java
@@ -45,7 +45,7 @@ public class GcpPubSubEmulatorAutoConfiguration {
 	@ConditionalOnMissingBean
 	public TransportChannelProvider transportChannelProvider(GcpPubSubProperties gcpPubSubProperties) {
 		ManagedChannel channel = ManagedChannelBuilder
-				.forTarget(gcpPubSubProperties.getEmulatorHost())
+				.forTarget("dns:///" + gcpPubSubProperties.getEmulatorHost())
 				.usePlaintext(true)
 				.build();
 		return FixedTransportChannelProvider.create(GrpcTransportChannel.create(channel));
diff --git a/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/trace/StackdriverTraceAutoConfiguration.java b/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/trace/StackdriverTraceAutoConfiguration.java
index d2170855bb..4b8536459d 100644
--- a/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/trace/StackdriverTraceAutoConfiguration.java
+++ b/spring-cloud-gcp-autoconfigure/src/main/java/org/springframework/cloud/gcp/autoconfigure/trace/StackdriverTraceAutoConfiguration.java
@@ -140,7 +140,7 @@ public ExecutorProvider traceExecutorProvider(@Qualifier("traceSenderThreadPool"
 	@Bean(destroyMethod = "shutdownNow")
 	@ConditionalOnMissingBean(name = "stackdriverSenderChannel")
 	public ManagedChannel stackdriverSenderChannel() {
-		return ManagedChannelBuilder.forTarget("cloudtrace.googleapis.com")
+		return ManagedChannelBuilder.forTarget("dns:///cloudtrace.googleapis.com")
 				.userAgent(this.headerProvider.getUserAgent())
 				.build();
 	}
diff --git a/spring-cloud-gcp-data-firestore/src/test/java/org/springframework/cloud/gcp/data/firestore/it/FirestoreIntegrationTestsConfiguration.java b/spring-cloud-gcp-data-firestore/src/test/java/org/springframework/cloud/gcp/data/firestore/it/FirestoreIntegrationTestsConfiguration.java
index c075d8e889..71ca1aaf50 100644
--- a/spring-cloud-gcp-data-firestore/src/test/java/org/springframework/cloud/gcp/data/firestore/it/FirestoreIntegrationTestsConfiguration.java
+++ b/spring-cloud-gcp-data-firestore/src/test/java/org/springframework/cloud/gcp/data/firestore/it/FirestoreIntegrationTestsConfiguration.java
@@ -57,7 +57,7 @@ FirestoreGrpc.FirestoreStub firestoreStub()  throws IOException {
 
 		// Create a channel
 		ManagedChannel channel = ManagedChannelBuilder
-				.forAddress("firestore.googleapis.com", 443)
+				.forTarget("dns:///firestore.googleapis.com:443")
 				.build();
 		return FirestoreGrpc.newStub(channel).withCallCredentials(callCredentials);
 	}
diff --git a/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/src/test/java/com/example/TraceSampleApplicationTests.java b/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/src/test/java/com/example/TraceSampleApplicationTests.java
index 523ac367b1..6da1552d2d 100644
--- a/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/src/test/java/com/example/TraceSampleApplicationTests.java
+++ b/spring-cloud-gcp-samples/spring-cloud-gcp-trace-sample/src/test/java/com/example/TraceSampleApplicationTests.java
@@ -107,7 +107,7 @@ public void setupTraceClient() throws IOException {
 				.getService();
 
 		ManagedChannel channel = ManagedChannelBuilder
-				.forTarget("cloudtrace.googleapis.com")
+				.forTarget("dns:///cloudtrace.googleapis.com")
 				.build();
 
 		this.traceServiceStub = TraceServiceGrpc.newBlockingStub(channel)