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/all-in-one/main.go b/cmd/all-in-one/main.go
index b6eac0a5280..f84848a52d4 100644
--- a/cmd/all-in-one/main.go
+++ b/cmd/all-in-one/main.go
@@ -74,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 {
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/docker-compose/kafka/docker-compose.yml b/docker-compose/kafka/docker-compose.yml
index e5719127fe9..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
@@ -95,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"