diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml
index 666b62e8a3a9..846bb5421eff 100644
--- a/docs/instrumentation-list.yaml
+++ b/docs/instrumentation-list.yaml
@@ -11386,7 +11386,7 @@ libraries:
       attributes:
       - name: db.client.connection.pool.name
         type: STRING
-- name: oshi
+- name: oshi-5.0
   display_name: OSHI
   description: |
     When the OSHI library is detected on the classpath, this instrumentation enables system metrics for memory, disk, and network operations.
@@ -11395,7 +11395,7 @@ libraries:
   library_link: https://github.com/oshi/oshi/
   source_path: instrumentation/oshi-5.0
   scope:
-    name: io.opentelemetry.oshi
+    name: io.opentelemetry.oshi-5.0
   has_standalone_library: true
   has_javaagent: true
   javaagent_target_versions:
@@ -11407,159 +11407,6 @@ libraries:
       metrics.
     type: boolean
     default: false
-  telemetry:
-  - when: default
-    metrics:
-    - name: system.disk.io
-      description: System disk IO
-      instrument: counter
-      data_type: LONG_SUM
-      unit: By
-      attributes:
-      - name: device
-        type: STRING
-      - name: direction
-        type: STRING
-    - name: system.disk.operations
-      description: System disk operations
-      instrument: counter
-      data_type: LONG_SUM
-      unit: '{operations}'
-      attributes:
-      - name: device
-        type: STRING
-      - name: direction
-        type: STRING
-    - name: system.memory.usage
-      description: System memory usage
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: By
-      attributes:
-      - name: state
-        type: STRING
-    - name: system.memory.utilization
-      description: System memory utilization
-      instrument: gauge
-      data_type: DOUBLE_GAUGE
-      unit: '1'
-      attributes:
-      - name: state
-        type: STRING
-    - name: system.network.errors
-      description: System network errors
-      instrument: counter
-      data_type: LONG_SUM
-      unit: '{errors}'
-      attributes:
-      - name: device
-        type: STRING
-      - name: direction
-        type: STRING
-    - name: system.network.io
-      description: System network IO
-      instrument: counter
-      data_type: LONG_SUM
-      unit: By
-      attributes:
-      - name: device
-        type: STRING
-      - name: direction
-        type: STRING
-    - name: system.network.packets
-      description: System network packets
-      instrument: counter
-      data_type: LONG_SUM
-      unit: '{packets}'
-      attributes:
-      - name: device
-        type: STRING
-      - name: direction
-        type: STRING
-  - when: otel.instrumentation.oshi.experimental-metrics.enabled=true
-    metrics:
-    - name: runtime.java.cpu_time
-      description: Runtime Java CPU time
-      instrument: gauge
-      data_type: LONG_GAUGE
-      unit: ms
-      attributes:
-      - name: type
-        type: STRING
-    - name: runtime.java.memory
-      description: Runtime Java memory
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: By
-      attributes:
-      - name: type
-        type: STRING
-    - name: system.disk.io
-      description: System disk IO
-      instrument: counter
-      data_type: LONG_SUM
-      unit: By
-      attributes:
-      - name: device
-        type: STRING
-      - name: direction
-        type: STRING
-    - name: system.disk.operations
-      description: System disk operations
-      instrument: counter
-      data_type: LONG_SUM
-      unit: '{operations}'
-      attributes:
-      - name: device
-        type: STRING
-      - name: direction
-        type: STRING
-    - name: system.memory.usage
-      description: System memory usage
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: By
-      attributes:
-      - name: state
-        type: STRING
-    - name: system.memory.utilization
-      description: System memory utilization
-      instrument: gauge
-      data_type: DOUBLE_GAUGE
-      unit: '1'
-      attributes:
-      - name: state
-        type: STRING
-    - name: system.network.errors
-      description: System network errors
-      instrument: counter
-      data_type: LONG_SUM
-      unit: '{errors}'
-      attributes:
-      - name: device
-        type: STRING
-      - name: direction
-        type: STRING
-    - name: system.network.io
-      description: System network IO
-      instrument: counter
-      data_type: LONG_SUM
-      unit: By
-      attributes:
-      - name: device
-        type: STRING
-      - name: direction
-        type: STRING
-    - name: system.network.packets
-      description: System network packets
-      instrument: counter
-      data_type: LONG_SUM
-      unit: '{packets}'
-      attributes:
-      - name: device
-        type: STRING
-      - name: direction
-        type: STRING
 - name: payara-5.2020
   display_name: Payara
   description: |
@@ -15823,7 +15670,7 @@ libraries:
   library_link: https://tomcat.apache.org/tomcat-8.5-doc/jdbc-pool.html
   source_path: instrumentation/tomcat/tomcat-jdbc-8.5
   scope:
-    name: io.opentelemetry.tomcat-jdbc
+    name: io.opentelemetry.tomcat-jdbc-8.5
   has_javaagent: true
   javaagent_target_versions:
   - org.apache.tomcat:tomcat-jdbc:[8.5.0,)
@@ -15834,98 +15681,6 @@ libraries:
       Opt-in to emit stable semantic conventions instead of the old experimental semantic conventions. Accepts a comma-separated list of semantic convention groups (e.g., `database`, `http`, `messaging`). Use `<group>/dup` to emit both old and new conventions simultaneously. Stable semantic conventions will become the default in version 3.0 of the agent.
     type: list
     default: ''
-  telemetry:
-  - when: default
-    metrics:
-    - name: db.client.connections.idle.max
-      description: The maximum number of idle open connections allowed.
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: '{connections}'
-      attributes:
-      - name: pool.name
-        type: STRING
-    - name: db.client.connections.idle.min
-      description: The minimum number of idle open connections allowed.
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: '{connections}'
-      attributes:
-      - name: pool.name
-        type: STRING
-    - name: db.client.connections.max
-      description: The maximum number of open connections allowed.
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: '{connections}'
-      attributes:
-      - name: pool.name
-        type: STRING
-    - name: db.client.connections.pending_requests
-      description: The number of pending requests for an open connection, cumulative
-        for the entire pool.
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: '{requests}'
-      attributes:
-      - name: pool.name
-        type: STRING
-    - name: db.client.connections.usage
-      description: The number of connections that are currently in state described
-        by the state attribute.
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: '{connections}'
-      attributes:
-      - name: pool.name
-        type: STRING
-      - name: state
-        type: STRING
-  - when: otel.semconv-stability.opt-in=database
-    metrics:
-    - name: db.client.connection.count
-      description: The number of connections that are currently in state described
-        by the state attribute.
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: '{connection}'
-      attributes:
-      - name: db.client.connection.pool.name
-        type: STRING
-      - name: db.client.connection.state
-        type: STRING
-    - name: db.client.connection.idle.max
-      description: The maximum number of idle open connections allowed.
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: '{connection}'
-      attributes:
-      - name: db.client.connection.pool.name
-        type: STRING
-    - name: db.client.connection.idle.min
-      description: The minimum number of idle open connections allowed.
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: '{connection}'
-      attributes:
-      - name: db.client.connection.pool.name
-        type: STRING
-    - name: db.client.connection.max
-      description: The maximum number of open connections allowed.
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: '{connection}'
-      attributes:
-      - name: db.client.connection.pool.name
-        type: STRING
-    - name: db.client.connection.pending_requests
-      description: The number of current pending requests for an open connection.
-      instrument: updowncounter
-      data_type: LONG_SUM
-      unit: '{request}'
-      attributes:
-      - name: db.client.connection.pool.name
-        type: STRING
 - name: twilio-6.6
   display_name: Twilio
   description: |