diff --git a/.fossa.yml b/.fossa.yml
index ce66de0fde..fb2c373fe0 100644
--- a/.fossa.yml
+++ b/.fossa.yml
@@ -271,9 +271,6 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:tapestry-5.4:javaagent'
-    - type: gradle
-      path: ./
-      target: ':instrumentation:tomcat:tomcat-jdbc'
     - type: gradle
       path: ./
       target: ':instrumentation:twilio-6.6:javaagent'
@@ -940,6 +937,9 @@ targets:
     - type: gradle
       path: ./
       target: ':instrumentation:tomcat:tomcat-common:javaagent'
+    - type: gradle
+      path: ./
+      target: ':instrumentation:tomcat:tomcat-jdbc:javaagent'
     - type: gradle
       path: ./
       target: ':instrumentation:vertx:vertx-kafka-client-3.6:javaagent'
diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml
index dd0092db16..f33bc363a2 100644
--- a/docs/instrumentation-list.yaml
+++ b/docs/instrumentation-list.yaml
@@ -1213,11 +1213,6 @@ opensearch:
     target_versions:
       javaagent:
       - org.opensearch.client:opensearch-rest-client:[1.0,)
-  - name: opensearch-java-2.0
-    srcPath: instrumentation/opensearch/opensearch-java-2.0
-    scope:
-      name: io.opentelemetry.opensearch-java-2.0
-    target_versions: {}
 opentelemetry:
   instrumentations:
   - name: opentelemetry-api-1.15
@@ -1959,6 +1954,13 @@ tomcat:
     target_versions:
       javaagent:
       - org.apache.tomcat.embed:tomcat-embed-core:[7.0.4, 10)
+  - name: tomcat-jdbc
+    srcPath: instrumentation/tomcat/tomcat-jdbc
+    scope:
+      name: io.opentelemetry.tomcat-jdbc
+    target_versions:
+      javaagent:
+      - org.apache.tomcat:tomcat-jdbc:[8.5.0,)
 twilio:
   instrumentations:
   - name: twilio-6.6
diff --git a/instrumentation/tomcat/tomcat-jdbc/build.gradle.kts b/instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts
similarity index 100%
rename from instrumentation/tomcat/tomcat-jdbc/build.gradle.kts
rename to instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts
diff --git a/instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/DataSourceProxyInstrumentation.java b/instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/DataSourceProxyInstrumentation.java
similarity index 100%
rename from instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/DataSourceProxyInstrumentation.java
rename to instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/DataSourceProxyInstrumentation.java
diff --git a/instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatConnectionPoolMetrics.java b/instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatConnectionPoolMetrics.java
similarity index 100%
rename from instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatConnectionPoolMetrics.java
rename to instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatConnectionPoolMetrics.java
diff --git a/instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java b/instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java
similarity index 100%
rename from instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java
rename to instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java
diff --git a/instrumentation/tomcat/tomcat-jdbc/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationTest.java b/instrumentation/tomcat/tomcat-jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationTest.java
similarity index 100%
rename from instrumentation/tomcat/tomcat-jdbc/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationTest.java
rename to instrumentation/tomcat/tomcat-jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationTest.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4493a6141d..22fb50e8f1 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -587,7 +587,7 @@ include(":instrumentation:tapestry-5.4:javaagent")
 include(":instrumentation:tomcat:tomcat-7.0:javaagent")
 include(":instrumentation:tomcat:tomcat-10.0:javaagent")
 include(":instrumentation:tomcat:tomcat-common:javaagent")
-include(":instrumentation:tomcat:tomcat-jdbc")
+include(":instrumentation:tomcat:tomcat-jdbc:javaagent")
 include(":instrumentation:twilio-6.6:javaagent")
 include(":instrumentation:undertow-1.4:bootstrap")
 include(":instrumentation:undertow-1.4:javaagent")