diff --git a/hack/create-kind-cluster.sh b/hack/create-kind-cluster.sh
index d2fe8e77e23..cc5d73aaf86 100755
--- a/hack/create-kind-cluster.sh
+++ b/hack/create-kind-cluster.sh
@@ -31,10 +31,7 @@ kind: Cluster
 # See: https://kubernetes.slack.com/archives/CEKK1KTN2/p1600268272383600
 kubeadmConfigPatches:
   - |
-    apiVersion: kubeadm.k8s.io/v1beta2
     kind: ClusterConfiguration
-    metadata:
-      name: config
     apiServer:
       extraArgs:
         "service-account-issuer": "kubernetes.default.svc"
diff --git a/test/rekt/features/broker/feature.go b/test/rekt/features/broker/feature.go
index f72962e6c83..02295ec9e2f 100644
--- a/test/rekt/features/broker/feature.go
+++ b/test/rekt/features/broker/feature.go
@@ -37,6 +37,7 @@ import (
 	"knative.dev/eventing/test/rekt/resources/trigger"
 
 	v1 "knative.dev/pkg/apis/duck/v1"
+	"knative.dev/pkg/network"
 	"knative.dev/pkg/ptr"
 
 	"knative.dev/reconciler-test/pkg/eventshub"
@@ -667,6 +668,8 @@ func brokerSubscriberUnreachable() *feature.Feature {
 	event.SetSource(eventSource)
 	event.SetData(cloudevents.ApplicationJSON, []byte(eventBody))
 
+	subscriberUri := fmt.Sprintf("http://fake.svc.%s", network.GetClusterDomainName())
+
 	//Install the broker
 	brokerName := feature.MakeRandomK8sName("broker")
 	f.Setup("install broker", broker.Install(brokerName, broker.WithEnvConfig()...))
@@ -679,7 +682,7 @@ func brokerSubscriberUnreachable() *feature.Feature {
 	f.Setup("install trigger", trigger.Install(
 		triggerName,
 		brokerName,
-		trigger.WithSubscriber(nil, "http://fake.svc.cluster.local"),
+		trigger.WithSubscriber(nil, subscriberUri),
 		trigger.WithDeadLetterSink(service.AsKReference(sink), ""),
 	))
 	f.Setup("trigger goes ready", trigger.IsReady(triggerName))
@@ -695,7 +698,7 @@ func brokerSubscriberUnreachable() *feature.Feature {
 			eventasssert.OnStore(sink).
 				Match(features.HasKnNamespaceHeader(environment.FromContext(ctx).Namespace())).
 				MatchEvent(
-					test.HasExtension("knativeerrordest", "http://fake.svc.cluster.local"),
+					test.HasExtension("knativeerrordest", subscriberUri),
 				).
 				AtLeast(1)(ctx, t)
 		},
diff --git a/test/rekt/features/channel/features.go b/test/rekt/features/channel/features.go
index c7254d2bdb0..7b059ba3625 100644
--- a/test/rekt/features/channel/features.go
+++ b/test/rekt/features/channel/features.go
@@ -26,6 +26,7 @@ import (
 	"github.com/cloudevents/sdk-go/v2/test"
 	"github.com/google/uuid"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
+	"knative.dev/pkg/network"
 	"knative.dev/reconciler-test/pkg/environment"
 	"knative.dev/reconciler-test/pkg/eventshub"
 	"knative.dev/reconciler-test/pkg/feature"
@@ -342,6 +343,8 @@ func channelSubscriberUnreachable(createSubscriberFn func(ref *duckv1.KReference
 	channelName := feature.MakeRandomK8sName("channel")
 	sub := feature.MakeRandomK8sName("subscription")
 
+	subscriberUri := fmt.Sprintf("http://fake.svc.%s", network.GetClusterDomainName())
+
 	ev := test.FullEvent()
 
 	f.Setup("install sink", eventshub.Install(sink, eventshub.StartReceiver))
@@ -350,7 +353,7 @@ func channelSubscriberUnreachable(createSubscriberFn func(ref *duckv1.KReference
 
 	f.Setup("install subscription", subscription.Install(sub,
 		subscription.WithChannel(channel_impl.AsRef(channelName)),
-		createSubscriberFn(nil, "http://fake.svc.cluster.local"),
+		createSubscriberFn(nil, subscriberUri),
 	))
 	f.Setup("channel is ready", channel_impl.IsReady(channelName))
 	f.Setup("channel is addressable", channel_impl.IsAddressable(channelName))
@@ -366,7 +369,7 @@ func channelSubscriberUnreachable(createSubscriberFn func(ref *duckv1.KReference
 
 	f.Assert("Receives dls extensions when subscriber is unreachable", eventasssert.OnStore(sink).
 		MatchEvent(
-			test.HasExtension("knativeerrordest", "http://fake.svc.cluster.local")).
+			test.HasExtension("knativeerrordest", subscriberUri)).
 		AtLeast(1),
 	)
 
diff --git a/test/upgrade/prober/configuration.go b/test/upgrade/prober/configuration.go
index 0f34f6e5c03..ce587cacc80 100644
--- a/test/upgrade/prober/configuration.go
+++ b/test/upgrade/prober/configuration.go
@@ -28,6 +28,7 @@ import (
 	"github.com/kelseyhightower/envconfig"
 	"github.com/pkg/errors"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
+	"knative.dev/pkg/network"
 	pkgTest "knative.dev/pkg/test"
 	pkgupgrade "knative.dev/pkg/test/upgrade"
 
@@ -53,7 +54,7 @@ const (
 
 	prefix = "eventing_upgrade_tests"
 
-	forwarderTargetFmt = "http://" + receiver.Name + ".%s.svc.cluster.local"
+	forwarderTargetFmt = "http://" + receiver.Name + ".%s.svc.%s"
 
 	defaultTraceExportLimit = 100
 )
@@ -192,7 +193,7 @@ func (p *prober) compileTemplate(templateName string, endpoint interface{}, trac
 		p.config,
 		endpoint,
 		tracingConfig,
-		fmt.Sprintf(forwarderTargetFmt, p.client.Namespace),
+		fmt.Sprintf(forwarderTargetFmt, p.client.Namespace, network.GetClusterDomainName()),
 	}
 	p.ensureNoError(tmpl.Execute(&buff, data))
 	return buff.String()
diff --git a/test/upgrade/prober/verify.go b/test/upgrade/prober/verify.go
index b55d6e27170..d8f39ac4ef5 100644
--- a/test/upgrade/prober/verify.go
+++ b/test/upgrade/prober/verify.go
@@ -32,6 +32,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
+	"knative.dev/pkg/network"
 	"knative.dev/pkg/system"
 	pkgTest "knative.dev/pkg/test"
 	"knative.dev/pkg/test/helpers"
@@ -141,7 +142,7 @@ func (p *prober) getStepNoFromMsg(message string) (string, error) {
 func (p *prober) getTraceForStepEvent(eventNo string) []byte {
 	p.log.Debugf("Fetching trace for Step event #%s", eventNo)
 	query := fmt.Sprintf("step=%s and cloudevents.type=%s and target=%s",
-		eventNo, event.StepType, fmt.Sprintf(forwarderTargetFmt, p.client.Namespace))
+		eventNo, event.StepType, fmt.Sprintf(forwarderTargetFmt, p.client.Namespace, network.GetClusterDomainName()))
 	trace, err := event.FindTrace(query)
 	if err != nil {
 		p.log.Warn(err)
@@ -158,7 +159,7 @@ func (p *prober) exportFinishedEventTrace() {
 func (p *prober) getTraceForFinishedEvent() []byte {
 	p.log.Info("Fetching trace for Finished event")
 	query := fmt.Sprintf("cloudevents.type=%s and target=%s",
-		event.FinishedType, fmt.Sprintf(forwarderTargetFmt, p.client.Namespace))
+		event.FinishedType, fmt.Sprintf(forwarderTargetFmt, p.client.Namespace, network.GetClusterDomainName()))
 	trace, err := event.FindTrace(query)
 	if err != nil {
 		p.log.Warn(err)