diff --git a/lib/promscrape/discovery/dns/dns.go b/lib/promscrape/discovery/dns/dns.go
index 1bf7eb1b1d..03615b3c00 100644
--- a/lib/promscrape/discovery/dns/dns.go
+++ b/lib/promscrape/discovery/dns/dns.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"strconv"
 	"strings"
 	"time"
 
@@ -122,8 +123,10 @@ func getAAddrLabels(ctx context.Context, sdc *SDConfig, lookupType string) ([]ma
 func appendAddrLabels(ms []map[string]string, name, target string, port int) []map[string]string {
 	addr := discoveryutils.JoinHostPort(target, port)
 	m := map[string]string{
-		"__address__":     addr,
-		"__meta_dns_name": name,
+		"__address__":                  addr,
+		"__meta_dns_name":              name,
+		"__meta_dns_srv_record_target": target,
+		"__meta_dns_srv_record_port":   strconv.Itoa(port),
 	}
 	return append(ms, m)
 }
diff --git a/lib/promscrape/discovery/kubernetes/endpointslices.go b/lib/promscrape/discovery/kubernetes/endpointslices.go
index 44ab4f124c..48a06a25ce 100644
--- a/lib/promscrape/discovery/kubernetes/endpointslices.go
+++ b/lib/promscrape/discovery/kubernetes/endpointslices.go
@@ -160,7 +160,7 @@ func getEndpointSliceLabels(eps *EndpointSlice, addr string, ea Endpoint, epp En
 		"__meta_kubernetes_endpointslice_endpoint_conditions_ready": strconv.FormatBool(ea.Conditions.Ready),
 		"__meta_kubernetes_endpointslice_port_name":                 epp.Name,
 		"__meta_kubernetes_endpointslice_port_protocol":             epp.Protocol,
-		"__meta_kubernetes_endpointslice_port":                      strconv.FormatUint(uint64(epp.Port), 10),
+		"__meta_kubernetes_endpointslice_port":                      strconv.Itoa(epp.Port),
 	}
 	if epp.AppProtocol != "" {
 		m["__meta_kubernetes_endpointslice_port_app_protocol"] = epp.AppProtocol