diff --git a/Makefile.BuildBinaries.mk b/Makefile.BuildBinaries.mk
index 28059904e58..4f3f593f32b 100644
--- a/Makefile.BuildBinaries.mk
+++ b/Makefile.BuildBinaries.mk
@@ -81,10 +81,6 @@ build-jaeger: build-ui _build-a-binary-jaeger$(SUFFIX)-$(GOOS)-$(GOARCH)
 build-all-in-one: BIN_NAME = all-in-one
 build-all-in-one: build-ui _build-a-binary-all-in-one$(SUFFIX)-$(GOOS)-$(GOARCH)
 
-.PHONY: build-agent
-build-agent: BIN_NAME = agent
-build-agent: _build-a-binary-agent$(SUFFIX)-$(GOOS)-$(GOARCH)
-
 .PHONY: build-query
 build-query: BIN_NAME = query
 build-query: build-ui _build-a-binary-query$(SUFFIX)-$(GOOS)-$(GOARCH)
@@ -135,7 +131,6 @@ build-binaries-linux-ppc64le:
 # build all binaries for one specific platform GOOS/GOARCH
 .PHONY: _build-platform-binaries
 _build-platform-binaries: \
-		build-agent \
 		build-all-in-one \
 		build-collector \
 		build-query \
@@ -155,7 +150,6 @@ _build-platform-binaries: \
 .PHONY: _build-platform-binaries-debug
 _build-platform-binaries-debug:
 _build-platform-binaries-debug: \
-	build-agent \
 	build-collector \
 	build-query \
 	build-ingester \
diff --git a/Makefile.Windows.mk b/Makefile.Windows.mk
index 6309e44e3c3..1c93f0a1639 100644
--- a/Makefile.Windows.mk
+++ b/Makefile.Windows.mk
@@ -64,7 +64,6 @@ _build-syso: $(GOVERSIONINFO)
 	$(eval SEMVER_MAJOR := $(word 2, $(SEMVER_ALL)))
 	$(eval SEMVER_MINOR := $(word 3, $(SEMVER_ALL)))
 	$(eval SEMVER_PATCH := $(word 4, $(SEMVER_ALL)))
-	$(call _build_syso_macro,Jaeger Agent,cmd/agent)
 	$(call _build_syso_macro,Jaeger Collector,cmd/collector)
 	$(call _build_syso_macro,Jaeger Query,cmd/query)
 	$(call _build_syso_macro,Jaeger Ingester,cmd/ingester)
diff --git a/cmd/agent/app/builder.go b/cmd/agent/app/builder.go
index b36fc41c13d..cc1de33026d 100644
--- a/cmd/agent/app/builder.go
+++ b/cmd/agent/app/builder.go
@@ -22,7 +22,6 @@ import (
 	"github.com/jaegertracing/jaeger/cmd/agent/app/servers/thriftudp"
 	"github.com/jaegertracing/jaeger/internal/safeexpvar"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
-	"github.com/jaegertracing/jaeger/ports"
 	agentThrift "github.com/jaegertracing/jaeger/thrift-gen/agent"
 )
 
@@ -38,7 +37,7 @@ const (
 	binaryProtocol  Protocol = "binary"
 )
 
-var defaultHTTPServerHostPort = ":" + strconv.Itoa(ports.AgentConfigServerHTTP)
+var defaultHTTPServerHostPort = ":" + strconv.Itoa(AgentConfigServerHTTP)
 
 // Model used to distinguish the data transfer model
 type Model string
diff --git a/cmd/agent/app/flags.go b/cmd/agent/app/flags.go
index be47a497260..f8e9d7b5681 100644
--- a/cmd/agent/app/flags.go
+++ b/cmd/agent/app/flags.go
@@ -10,8 +10,6 @@ import (
 	"strconv"
 
 	"github.com/spf13/viper"
-
-	"github.com/jaegertracing/jaeger/ports"
 )
 
 const (
@@ -30,9 +28,9 @@ var defaultProcessors = []struct {
 	protocol Protocol
 	port     int
 }{
-	{model: "zipkin", protocol: "compact", port: ports.AgentZipkinThriftCompactUDP},
-	{model: "jaeger", protocol: "compact", port: ports.AgentJaegerThriftCompactUDP},
-	{model: "jaeger", protocol: "binary", port: ports.AgentJaegerThriftBinaryUDP},
+	{model: "zipkin", protocol: "compact", port: AgentZipkinThriftCompactUDP},
+	{model: "jaeger", protocol: "compact", port: AgentJaegerThriftCompactUDP},
+	{model: "jaeger", protocol: "binary", port: AgentJaegerThriftBinaryUDP},
 }
 
 // AddFlags adds flags for Builder.
diff --git a/cmd/agent/app/ports.go b/cmd/agent/app/ports.go
new file mode 100644
index 00000000000..9304df859d1
--- /dev/null
+++ b/cmd/agent/app/ports.go
@@ -0,0 +1,17 @@
+// Copyright (c) 2019 The Jaeger Authors.
+// SPDX-License-Identifier: Apache-2.0
+
+package app
+
+const (
+	// AgentJaegerThriftCompactUDP is the default port for receiving Jaeger Thrift over UDP in compact encoding
+	AgentJaegerThriftCompactUDP = 6831
+	// AgentJaegerThriftBinaryUDP is the default port for receiving Jaeger Thrift over UDP in binary encoding
+	AgentJaegerThriftBinaryUDP = 6832
+	// AgentZipkinThriftCompactUDP is the default port for receiving Zipkin Thrift over UDP in binary encoding
+	AgentZipkinThriftCompactUDP = 5775
+	// AgentConfigServerHTTP is the default port for the agent's HTTP config server (e.g. /sampling endpoint)
+	AgentConfigServerHTTP = 5778
+	// AgentAdminHTTP is the default admin HTTP port (health check, metrics, etc.)
+	AgentAdminHTTP = 14271
+)
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
index b1f5a766fd3..74b674a1516 100644
--- a/cmd/agent/main.go
+++ b/cmd/agent/main.go
@@ -23,7 +23,6 @@ import (
 	"github.com/jaegertracing/jaeger/pkg/config"
 	"github.com/jaegertracing/jaeger/pkg/metrics"
 	"github.com/jaegertracing/jaeger/pkg/version"
-	"github.com/jaegertracing/jaeger/ports"
 )
 
 func main() {
@@ -31,7 +30,7 @@ func main() {
 	println("*** WARNING jaeger-agent is deprecated. See https://github.com/jaegertracing/jaeger/issues/4739 ***")
 	println("***************************************************************************************************")
 
-	svc := flags.NewService(ports.AgentAdminHTTP)
+	svc := flags.NewService(app.AgentAdminHTTP)
 	svc.NoStorage = true
 
 	v := viper.New()
@@ -92,7 +91,7 @@ func main() {
 
 	command.AddCommand(version.Command())
 	command.AddCommand(docs.Command(v))
-	command.AddCommand(status.Command(v, ports.AgentAdminHTTP))
+	command.AddCommand(status.Command(v, app.AgentAdminHTTP))
 
 	config.AddFlags(
 		v,
diff --git a/cmd/all-in-one/Dockerfile b/cmd/all-in-one/Dockerfile
index 394bb1d39b1..3a9e3637e15 100644
--- a/cmd/all-in-one/Dockerfile
+++ b/cmd/all-in-one/Dockerfile
@@ -8,18 +8,6 @@ FROM $base_image AS release
 ARG TARGETARCH
 ARG USER_UID=10001
 
-# Agent zipkin.thrift compact
-EXPOSE 5775/udp
-
-# Agent jaeger.thrift compact
-EXPOSE 6831/udp
-
-# Agent jaeger.thrift binary
-EXPOSE 6832/udp
-
-# Agent config HTTP
-EXPOSE 5778
-
 # Collector OTLP gRPC
 EXPOSE 4317
 
@@ -52,18 +40,6 @@ FROM $debug_image AS debug
 ARG TARGETARCH=amd64
 ARG USER_UID=10001
 
-# Agent zipkin.thrift compact
-EXPOSE 5775/udp
-
-# Agent jaeger.thrift compact
-EXPOSE 6831/udp
-
-# Agent jaeger.thrift binary
-EXPOSE 6832/udp
-
-# Agent config HTTP
-EXPOSE 5778
-
 # Collector OTLP gRPC
 EXPOSE 4317
 
diff --git a/cmd/all-in-one/all_in_one_test.go b/cmd/all-in-one/all_in_one_test.go
index 875b05fa718..bb38b3d8c9e 100644
--- a/cmd/all-in-one/all_in_one_test.go
+++ b/cmd/all-in-one/all_in_one_test.go
@@ -7,6 +7,7 @@ package main
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
 	"io"
 	"net/http"
 	"os"
@@ -20,24 +21,25 @@ import (
 	"github.com/stretchr/testify/require"
 
 	ui "github.com/jaegertracing/jaeger/model/json"
+	"github.com/jaegertracing/jaeger/ports"
 	"github.com/jaegertracing/jaeger/proto-gen/api_v2"
 )
 
 // These tests are only run when the environment variable TEST_MODE=integration is set.
 
 const (
-	host       = "0.0.0.0"
-	queryPort  = "16686"
-	agentPort  = "5778"
-	healthPort = "13133"
-	queryAddr  = "http://" + host + ":" + queryPort
-	agentAddr  = "http://" + host + ":" + agentPort
-	healthAddr = "http://" + host + ":" + healthPort + "/status"
+	host = "0.0.0.0"
 
 	getServicesURL         = "/api/services"
 	getTraceURL            = "/api/traces/"
 	getServicesAPIV3URL    = "/api/v3/services"
-	getSamplingStrategyURL = "/sampling?service=whatever"
+	getSamplingStrategyURL = "/api/sampling?service=whatever"
+)
+
+var (
+	queryAddr    = fmt.Sprintf("http://%s:%d", host, ports.QueryHTTP)
+	samplingAddr = fmt.Sprintf("http://%s:%d", host, ports.CollectorHTTP)
+	healthAddr   = fmt.Sprintf("http://%s:%d/status", host, ports.CollectorV2HealthChecks)
 )
 
 var traceID string // stores state exchanged between createTrace and getAPITrace
@@ -170,7 +172,7 @@ func getAPITrace(t *testing.T) {
 func getSamplingStrategy(t *testing.T) {
 	// TODO should we test refreshing the strategy file?
 
-	r, body := httpGet(t, agentAddr+getSamplingStrategyURL)
+	r, body := httpGet(t, samplingAddr+getSamplingStrategyURL)
 	t.Logf("Sampling strategy response: %s", string(body))
 	require.EqualValues(t, http.StatusOK, r.StatusCode)
 
diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go
index 15c8c8cd5e2..f84848a52d4 100644
--- a/cmd/all-in-one/main.go
+++ b/cmd/all-in-one/main.go
@@ -6,6 +6,7 @@ package main
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"log"
@@ -16,9 +17,6 @@ import (
 	_ "go.uber.org/automaxprocs"
 	"go.uber.org/zap"
 
-	agentApp "github.com/jaegertracing/jaeger/cmd/agent/app"
-	agentRep "github.com/jaegertracing/jaeger/cmd/agent/app/reporter"
-	agentGrpcRep "github.com/jaegertracing/jaeger/cmd/agent/app/reporter/grpc"
 	"github.com/jaegertracing/jaeger/cmd/all-in-one/setupcontext"
 	collectorApp "github.com/jaegertracing/jaeger/cmd/collector/app"
 	collectorFlags "github.com/jaegertracing/jaeger/cmd/collector/app/flags"
@@ -76,8 +74,8 @@ func main() {
 	v := viper.New()
 	command := &cobra.Command{
 		Use:   "jaeger-all-in-one",
-		Short: "Jaeger all-in-one distribution with agent, collector and query in one process.",
-		Long: `Jaeger all-in-one distribution with agent, collector and query. Use with caution this version
+		Short: "Jaeger all-in-one distribution with collector and query in one process.",
+		Long: `Jaeger all-in-one distribution with collector and query. Use with caution: this version
 by default uses only in-memory database.`,
 		RunE: func(_ *cobra.Command, _ /* args */ []string) error {
 			if err := svc.Start(v); err != nil {
@@ -86,7 +84,6 @@ by default uses only in-memory database.`,
 			logger := svc.Logger // shortcut
 			baseFactory := svc.MetricsFactory.Namespace(metrics.NSOptions{Name: "jaeger"})
 			version.NewInfoMetrics(baseFactory)
-			agentMetricsFactory := baseFactory.Namespace(metrics.NSOptions{Name: "agent"})
 			collectorMetricsFactory := baseFactory.Namespace(metrics.NSOptions{Name: "collector"})
 			queryMetricsFactory := baseFactory.Namespace(metrics.NSOptions{Name: "query"})
 
@@ -132,12 +129,6 @@ by default uses only in-memory database.`,
 				logger.Fatal("Failed to create sampling strategy provider", zap.Error(err))
 			}
 
-			aOpts := new(agentApp.Builder).InitFromViper(v)
-			repOpts := new(agentRep.Options).InitFromViper(v, logger)
-			grpcBuilder, err := agentGrpcRep.NewConnBuilder().InitFromViper(v)
-			if err != nil {
-				logger.Fatal("Failed to configure connection for grpc", zap.Error(err))
-			}
 			cOpts, err := new(collectorFlags.CollectorOptions).InitFromViper(v, logger)
 			if err != nil {
 				logger.Fatal("Failed to initialize collector", zap.Error(err))
@@ -164,25 +155,6 @@ by default uses only in-memory database.`,
 				log.Fatal(err)
 			}
 
-			// agent
-			// if the agent reporter grpc host:port was not explicitly set then use whatever the collector is listening on
-			if len(grpcBuilder.CollectorHostPorts) == 0 {
-				grpcBuilder.CollectorHostPorts = append(grpcBuilder.CollectorHostPorts, cOpts.GRPC.HostPort)
-			}
-			ctx, cancel := context.WithCancel(context.Background())
-			defer cancel()
-			builders := map[agentRep.Type]agentApp.CollectorProxyBuilder{
-				agentRep.GRPC: agentApp.GRPCCollectorProxyBuilder(grpcBuilder),
-			}
-			cp, err := agentApp.CreateCollectorProxy(ctx, agentApp.ProxyBuilderOptions{
-				Options: *repOpts,
-				Logger:  logger,
-				Metrics: agentMetricsFactory,
-			}, builders)
-			if err != nil {
-				logger.Fatal("Could not create collector proxy", zap.Error(err))
-			}
-			agent := startAgent(cp, aOpts, logger, agentMetricsFactory)
 			telset := telemetery.Setting{
 				Logger:         svc.Logger,
 				TracerProvider: tracer.OTEL,
@@ -197,20 +169,16 @@ by default uses only in-memory database.`,
 			)
 
 			svc.RunAndThen(func() {
-				agent.Stop()
-				_ = cp.Close()
-				_ = c.Close()
-				_ = querySrv.Close()
+				var errs []error
+				errs = append(errs, c.Close())
+				errs = append(errs, querySrv.Close())
 				if closer, ok := spanWriter.(io.Closer); ok {
-					if err := closer.Close(); err != nil {
-						logger.Error("Failed to close span writer", zap.Error(err))
-					}
+					errs = append(errs, closer.Close())
 				}
-				if err := storageFactory.Close(); err != nil {
-					logger.Error("Failed to close storage factory", zap.Error(err))
-				}
-				if err := tracer.Close(context.Background()); err != nil {
-					logger.Error("Error shutting down tracer provider", zap.Error(err))
+				errs = append(errs, storageFactory.Close())
+				errs = append(errs, tracer.Close(context.Background()))
+				if err := errors.Join(errs...); err != nil {
+					logger.Error("Failed to close services", zap.Error(err))
 				}
 			})
 			return nil
@@ -228,9 +196,6 @@ by default uses only in-memory database.`,
 		command,
 		svc.AddFlags,
 		storageFactory.AddPipelineFlags,
-		agentApp.AddFlags,
-		agentRep.AddFlags,
-		agentGrpcRep.AddFlags,
 		collectorFlags.AddFlags,
 		queryApp.AddFlags,
 		samplingStrategyFactory.AddFlags,
@@ -242,25 +207,6 @@ by default uses only in-memory database.`,
 	}
 }
 
-func startAgent(
-	cp agentApp.CollectorProxy,
-	b *agentApp.Builder,
-	logger *zap.Logger,
-	baseFactory metrics.Factory,
-) *agentApp.Agent {
-	agent, err := b.CreateAgent(cp, logger, baseFactory)
-	if err != nil {
-		logger.Fatal("Unable to initialize Jaeger Agent", zap.Error(err))
-	}
-
-	logger.Info("Starting agent")
-	if err := agent.Run(); err != nil {
-		logger.Fatal("Failed to run the agent", zap.Error(err))
-	}
-
-	return agent
-}
-
 func startQuery(
 	svc *flags.Service,
 	qOpts *queryApp.QueryOptions,
diff --git a/cmd/collector/main.go b/cmd/collector/main.go
index 750b3f7d3a3..db658c209b4 100644
--- a/cmd/collector/main.go
+++ b/cmd/collector/main.go
@@ -52,8 +52,8 @@ func main() {
 	v := viper.New()
 	command := &cobra.Command{
 		Use:   "jaeger-collector",
-		Short: "Jaeger collector receives and processes traces from Jaeger agents and clients",
-		Long:  `Jaeger collector receives traces from Jaeger agents and runs them through a processing pipeline.`,
+		Short: "Jaeger collector receives and stores traces",
+		Long:  `Jaeger collector receives traces and runs them through a processing pipeline.`,
 		RunE: func(_ *cobra.Command, _ /* args */ []string) error {
 			if err := svc.Start(v); err != nil {
 				return err
diff --git a/cmd/jaeger/Dockerfile b/cmd/jaeger/Dockerfile
index 5ff10914439..464d81413b1 100644
--- a/cmd/jaeger/Dockerfile
+++ b/cmd/jaeger/Dockerfile
@@ -10,15 +10,6 @@ FROM $base_image AS release
 ARG TARGETARCH
 ARG USER_UID=10001
 
-# Agent zipkin.thrift compact
-EXPOSE 5775/udp
-
-# Agent jaeger.thrift compact
-EXPOSE 6831/udp
-
-# Agent jaeger.thrift binary
-EXPOSE 6832/udp
-
 # Sampling config HTTP
 EXPOSE 5778
 
@@ -62,15 +53,6 @@ FROM $debug_image AS debug
 ARG TARGETARCH=amd64
 ARG USER_UID=10001
 
-# Agent zipkin.thrift compact
-EXPOSE 5775/udp
-
-# Agent jaeger.thrift compact
-EXPOSE 6831/udp
-
-# Agent jaeger.thrift binary
-EXPOSE 6832/udp
-
 # Sampling config HTTP
 EXPOSE 5778
 
diff --git a/cmd/jaeger/internal/extension/remotesampling/extension.go b/cmd/jaeger/internal/extension/remotesampling/extension.go
index f88a6ae28d4..be16a7b498d 100644
--- a/cmd/jaeger/internal/extension/remotesampling/extension.go
+++ b/cmd/jaeger/internal/extension/remotesampling/extension.go
@@ -231,8 +231,7 @@ func (ext *rsExtension) startHTTPServer(ctx context.Context, host component.Host
 
 		// In v1 the sampling endpoint in the collector was at /api/sampling, because
 		// the collector reused the same port for multiple services. In v2, the extension
-		// always uses a separate port, making /api prefix unnecessary. So we mimic the behavior
-		// of jaeger-agent port 5778 which serves sampling strategies at /sampling endpoint.
+		// always uses a separate port, making /api prefix unnecessary.
 		BasePath: "",
 	})
 	httpMux := http.NewServeMux()
diff --git a/cmd/jaeger/internal/extension/remotesampling/factory.go b/cmd/jaeger/internal/extension/remotesampling/factory.go
index b0575bddbaf..51e9f2e1e45 100644
--- a/cmd/jaeger/internal/extension/remotesampling/factory.go
+++ b/cmd/jaeger/internal/extension/remotesampling/factory.go
@@ -34,11 +34,11 @@ func NewFactory() extension.Factory {
 func createDefaultConfig() component.Config {
 	return &Config{
 		HTTP: &confighttp.ServerConfig{
-			Endpoint: ports.PortToHostPort(ports.AgentConfigServerHTTP),
+			Endpoint: ports.PortToHostPort(ports.CollectorV2SamplingHTTP),
 		},
 		GRPC: &configgrpc.ServerConfig{
 			NetAddr: confignet.AddrConfig{
-				Endpoint:  ports.PortToHostPort(ports.AgentConfigServerHTTP + 1),
+				Endpoint:  ports.PortToHostPort(ports.CollectorV2SamplingGRPC),
 				Transport: confignet.TransportTypeTCP,
 			},
 		},
diff --git a/crossdock/docker-compose.yml b/crossdock/docker-compose.yml
index fe88cd2e631..59707a96d07 100644
--- a/crossdock/docker-compose.yml
+++ b/crossdock/docker-compose.yml
@@ -3,49 +3,22 @@ services:
         image: crossdock/crossdock
         links:
             - test_driver
-            - go
-            - node
-            - java
-            - python
             - zipkin-brave-thrift
             - zipkin-brave-json
             - zipkin-brave-json-v2
             - zipkin-brave-proto
 
         environment:
-            - WAIT_FOR=test_driver,go,node,java,python,zipkin-brave-thrift,zipkin-brave-json,zipkin-brave-json-v2,zipkin-brave-proto
+            - WAIT_FOR=test_driver,zipkin-brave-thrift,zipkin-brave-json,zipkin-brave-json-v2,zipkin-brave-proto
             - WAIT_FOR_TIMEOUT=240s
 
             - CALL_TIMEOUT=60s
 
             - AXIS_CLIENT=test_driver
-            - AXIS_SERVICES=go,node,java,python,zipkin-brave-thrift,zipkin-brave-json,zipkin-brave-json-v2,zipkin-brave-proto
+            - AXIS_SERVICES=zipkin-brave-thrift,zipkin-brave-json,zipkin-brave-json-v2,zipkin-brave-proto
 
             - BEHAVIOR_ENDTOEND=client,services
 
-    go:
-        image: jaegertracing/xdock-go
-        ports:
-            - "8080-8082"
-
-    node:
-        image: jaegertracing/xdock-node
-        ports:
-            - "8080-8082"
-
-    java:
-        image: jaegertracing/xdock-java
-        ports:
-            - "8080-8082"
-        depends_on:
-            # UDP sender needs to know agent's address
-            - jaeger-agent
-
-    python:
-        image: jaegertracing/xdock-py
-        ports:
-            - "8080-8082"
-
     zipkin-brave-thrift:
         image: jaegertracing/xdock-zipkin-brave
         ports:
@@ -85,4 +58,3 @@ services:
         depends_on:
             - jaeger-query
             - jaeger-collector
-            - jaeger-agent
diff --git a/crossdock/jaeger-docker-compose.yml b/crossdock/jaeger-docker-compose.yml
index ef90fea73a4..f0020c40d49 100644
--- a/crossdock/jaeger-docker-compose.yml
+++ b/crossdock/jaeger-docker-compose.yml
@@ -39,17 +39,3 @@ services:
       restart: on-failure
       depends_on:
         - jaeger-remote-storage
-
-    jaeger-agent:
-      image: jaegertracing/jaeger-agent
-      command: ["--reporter.grpc.host-port=jaeger-collector:14250", "--reporter.grpc.retry.max=1000"]
-      ports:
-        - "5775:5775/udp"
-        - "6831:6831/udp"
-        - "6832:6832/udp"
-        - "5778:5778"
-      environment:
-        - LOG_LEVEL=debug
-      restart: on-failure
-      depends_on:
-        - jaeger-collector
diff --git a/docker-compose/jaeger-docker-compose.yml b/docker-compose/jaeger-docker-compose.yml
index 1d024e1521c..fca7a71d1ed 100644
--- a/docker-compose/jaeger-docker-compose.yml
+++ b/docker-compose/jaeger-docker-compose.yml
@@ -5,23 +5,16 @@ services:
         - '8080:8080'
         - '8083:8083'
       command: ["-m","prometheus","all"]
-      environment:
-        - JAEGER_AGENT_HOST=jaeger-agent
-        - JAEGER_AGENT_PORT=6831
-        - JAEGER_SAMPLER_TYPE=remote
-        - JAEGER_SAMPLING_ENDPOINT=http://jaeger-agent:5778/sampling
-      depends_on:
-        - jaeger-agent
 
     jaeger-collector:
       image: jaegertracing/jaeger-collector
-      command: 
+      command:
         - "--cassandra.keyspace=jaeger_v1_dc1"
         - "--cassandra.servers=cassandra"
         - "--collector.zipkin.host-port=9411"
         - "--sampling.initial-sampling-probability=.5"
         - "--sampling.target-samples-per-second=.01"
-      environment: 
+      environment:
         - SAMPLING_CONFIG_TYPE=adaptive
       ports:
         - "14269:14269"
@@ -42,18 +35,6 @@ services:
       depends_on:
         - cassandra-schema
 
-    jaeger-agent:
-      image: jaegertracing/jaeger-agent
-      command: ["--reporter.grpc.host-port=jaeger-collector:14250"]
-      ports:
-        - "5775:5775/udp"
-        - "6831:6831/udp"
-        - "6832:6832/udp"
-        - "5778:5778"
-      restart: on-failure
-      depends_on:
-        - jaeger-collector
-
     cassandra:
       image: cassandra:4.0
 
@@ -61,4 +42,3 @@ services:
       image: jaegertracing/jaeger-cassandra-schema
       depends_on:
         - cassandra
-
diff --git a/docker-compose/kafka/docker-compose.yml b/docker-compose/kafka/docker-compose.yml
index 9eb2130559c..58e3061fa8f 100644
--- a/docker-compose/kafka/docker-compose.yml
+++ b/docker-compose/kafka/docker-compose.yml
@@ -45,7 +45,6 @@ services:
   jaeger-collector:
     image: jaegertracing/jaeger-collector
     command:
-      - "--collector.otlp.enabled=true"
       - "--log-level=debug"
     ports:
       - 4318:4318
@@ -88,27 +87,6 @@ services:
       - kafka
       - jaeger-remote-storage
 
-  jaeger-agent:
-    image: jaegertracing/jaeger-agent
-    command:
-      - "--reporter.grpc.host-port=jaeger-collector:14250"
-      - "--log-level=debug"
-    ports:
-      - "6831:6831/udp"
-      - "6832:6832/udp"
-      - "5778:5778"
-    restart: on-failure
-    healthcheck:
-      test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:14271/ || exit 1"]
-      interval: 5s
-      timeout: 5s
-      retries: 3
-    depends_on:
-      jaeger-collector:
-        condition: service_healthy
-    links:
-      - jaeger-collector
-
   jaeger-query:
     image: jaegertracing/jaeger-query
     command:
@@ -116,7 +94,7 @@ services:
       - "--log-level=debug"
     environment:
       - SPAN_STORAGE_TYPE=grpc
-      - JAEGER_AGENT_HOST=jaeger-agent
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger-collector:4318
     ports:
       - "16686:16686"
       - "16687"
@@ -130,5 +108,4 @@ services:
       jaeger-remote-storage:
         condition: service_healthy
     links:
-      - jaeger-agent
       - jaeger-remote-storage
diff --git a/ports/ports.go b/ports/ports.go
index a877509d39e..c1244dfb52b 100644
--- a/ports/ports.go
+++ b/ports/ports.go
@@ -9,17 +9,6 @@ import (
 )
 
 const (
-	// AgentJaegerThriftCompactUDP is the default port for receiving Jaeger Thrift over UDP in compact encoding
-	AgentJaegerThriftCompactUDP = 6831
-	// AgentJaegerThriftBinaryUDP is the default port for receiving Jaeger Thrift over UDP in binary encoding
-	AgentJaegerThriftBinaryUDP = 6832
-	// AgentZipkinThriftCompactUDP is the default port for receiving Zipkin Thrift over UDP in binary encoding
-	AgentZipkinThriftCompactUDP = 5775
-	// AgentConfigServerHTTP is the default port for the agent's HTTP config server (e.g. /sampling endpoint)
-	AgentConfigServerHTTP = 5778
-	// AgentAdminHTTP is the default admin HTTP port (health check, metrics, etc.)
-	AgentAdminHTTP = 14271
-
 	// CollectorGRPC is the default port for gRPC server for sending spans
 	CollectorGRPC = 14250
 	// CollectorHTTP is the default port for HTTP server for sending spans (e.g. /api/traces endpoint)
@@ -29,6 +18,13 @@ const (
 	// CollectorZipkin is the port for Zipkin server for sending spans
 	CollectorZipkin = 9411
 
+	// CollectorV2GRPC is the HTTP port for remote sampling extension
+	CollectorV2SamplingHTTP = 5778
+	// CollectorV2GRPC is the gRPC port for remote sampling extension
+	CollectorV2SamplingGRPC = 5779
+	// CollectorV2HealthChecks is the port for health checks extension
+	CollectorV2HealthChecks = 13133
+
 	// QueryGRPC is the default port of GRPC requests for Query trace retrieval
 	QueryGRPC = 16685
 	// QueryHTTP is the default port for UI and Query API (e.g. /api/* endpoints)
diff --git a/scripts/build-all-in-one-image.sh b/scripts/build-all-in-one-image.sh
index b534a809312..3663c5f3cfb 100755
--- a/scripts/build-all-in-one-image.sh
+++ b/scripts/build-all-in-one-image.sh
@@ -20,6 +20,10 @@ add_debugger='Y'
 platforms="$(make echo-linux-platforms)"
 FLAGS=()
 
+# this script doesn't use BRANCH and GITHUB_SHA itself, but its dependency scripts do.
+export BRANCH=${BRANCH?'env var is required'}
+export GITHUB_SHA=${GITHUB_SHA:-$(git rev-parse HEAD)}
+
 while getopts "Dhlop:" opt; do
 	case "${opt}" in
 	D)
@@ -52,10 +56,12 @@ fi
 case $1 in
   v1)
     BINARY='all-in-one'
+    sampling_port=14268
     export HEALTHCHECK_V2=false
     ;;
   v2)
     BINARY='jaeger'
+    sampling_port=5778
     export HEALTHCHECK_V2=true
     ;;
   *)
@@ -87,7 +93,7 @@ make build-ui
 
 run_integration_test() {
   local image_name="$1"
-  CID=$(docker run -d -p 16686:16686 -p 5778:5778 -p13133:13133 "${image_name}:${GITHUB_SHA}")
+  CID=$(docker run -d -p 16686:16686 -p 13133:13133 -p "14268:${sampling_port}" "${image_name}:${GITHUB_SHA}")
 
   if ! make all-in-one-integration-test ; then
       echo "---- integration test failed unexpectedly ----"
diff --git a/scripts/build-upload-docker-images.sh b/scripts/build-upload-docker-images.sh
index 5e64fec2193..273f7fe5506 100755
--- a/scripts/build-upload-docker-images.sh
+++ b/scripts/build-upload-docker-images.sh
@@ -63,7 +63,7 @@ fi
 make "$baseimg_target" LINUX_PLATFORMS="$platforms"
 
 # build/upload raw and debug images of Jaeger backend components
-for component in agent collector query ingester remote-storage
+for component in collector query ingester remote-storage
 do
   bash scripts/build-upload-a-docker-image.sh "${FLAGS[@]}" -b -c "jaeger-${component}" -d "cmd/${component}" -p "${platforms}" -t release
   # do not need debug image built for PRs
diff --git a/scripts/generate-help-output.sh b/scripts/generate-help-output.sh
index b69f281d1e5..d9f48b93a78 100755
--- a/scripts/generate-help-output.sh
+++ b/scripts/generate-help-output.sh
@@ -23,7 +23,6 @@ function gen {
 
 set -ex
 
-gen agent      nostorage
 gen collector  cassandra elasticsearch memory kafka badger grpc
 gen query      cassandra elasticsearch memory badger grpc
 gen ingester   cassandra elasticsearch memory badger grpc
diff --git a/scripts/package-deploy.sh b/scripts/package-deploy.sh
index 6c6fc23c2e6..fbac33def87 100755
--- a/scripts/package-deploy.sh
+++ b/scripts/package-deploy.sh
@@ -42,7 +42,6 @@ function stage-platform-files-v1 {
     local -r FILE_EXTENSION=${3:-}
 
     cp "./cmd/all-in-one/all-in-one-${PLATFORM}"  "${PACKAGE_STAGING_DIR}/jaeger-all-in-one${FILE_EXTENSION}"
-    cp "./cmd/agent/agent-${PLATFORM}"            "${PACKAGE_STAGING_DIR}/jaeger-agent${FILE_EXTENSION}"
     cp "./cmd/query/query-${PLATFORM}"            "${PACKAGE_STAGING_DIR}/jaeger-query${FILE_EXTENSION}"
     cp "./cmd/collector/collector-${PLATFORM}"    "${PACKAGE_STAGING_DIR}/jaeger-collector${FILE_EXTENSION}"
     cp "./cmd/ingester/ingester-${PLATFORM}"      "${PACKAGE_STAGING_DIR}/jaeger-ingester${FILE_EXTENSION}"