diff --git a/.github/component_owners.yml b/.github/component_owners.yml
index 5ed1d3c69..552ca7edd 100644
--- a/.github/component_owners.yml
+++ b/.github/component_owners.yml
@@ -75,3 +75,5 @@ components:
     - jackshirazi
     - jonaskunz
     - sylvainjuge
+  opamp-client:
+    - LikeTheSalad
diff --git a/opamp-client/README.md b/opamp-client/README.md
new file mode 100644
index 000000000..c121aa904
--- /dev/null
+++ b/opamp-client/README.md
@@ -0,0 +1,10 @@
+# OpAMP Client
+
+Java implementation of the OpAMP
+client [spec](https://github.com/open-telemetry/opamp-spec/blob/main/specification.md).
+
+## Component owners
+
+- [Cesar Munoz](https://github.com/LikeTheSalad), Elastic
+
+Learn more about component owners in [component_owners.yml](../.github/component_owners.yml).
diff --git a/opamp-client/build.gradle.kts b/opamp-client/build.gradle.kts
new file mode 100644
index 000000000..c094faf03
--- /dev/null
+++ b/opamp-client/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+  id("otel.java-conventions")
+}
+
+description = "Client implementation of the OpAMP spec."
+otelJava.moduleName.set("io.opentelemetry.contrib.opamp.client")
+
+java {
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b3932fbf3..a127e4d63 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -88,3 +88,4 @@ include(":kafka-exporter")
 include(":gcp-resources")
 include(":span-stacktrace")
 include(":inferred-spans")
+include(":opamp-client")