diff --git a/dd-trace/src/main/java/com/datadoghq/trace/integration/DBComponent.java b/dd-trace/src/main/java/com/datadoghq/trace/integration/DBComponent.java
index 113e61169d..a26f7a7f2e 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/integration/DBComponent.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/integration/DBComponent.java
@@ -12,12 +12,12 @@ public class DBComponent extends DDSpanContextDecorator {
 
   public DBComponent() {
     super();
-    this.setMatchingTag(Tags.COMPONENT.getKey());
+    this.setMatchingTag(Tags.DB_TYPE.getKey());
     this.setSetTag(DDTags.SERVICE_NAME);
   }
 
   @Override
-  public boolean afterSetTag(DDSpanContext context, String tag, Object value) {
+  public boolean afterSetTag(final DDSpanContext context, final String tag, final Object value) {
     //Assign service name
     if (super.afterSetTag(context, tag, value)) {
       //Assign span type to DB
diff --git a/dd-trace/src/main/resources/dd-trace-decorators.yaml b/dd-trace/src/main/resources/dd-trace-decorators.yaml
index 0371b54d55..b7b5b047be 100644
--- a/dd-trace/src/main/resources/dd-trace-decorators.yaml
+++ b/dd-trace/src/main/resources/dd-trace-decorators.yaml
@@ -5,17 +5,6 @@ decorators:
     matchingValue: java-okhttp
     setValue: http-client
   - type: DBComponent
-    matchingValue: java-mongo
-    setValue: mongo
-  - type: DBComponent
-    matchingValue: java-jdbc
-    setValue: jdbc
-  - type: DBComponent
-    matchingValue: java-cassandra
-    setValue: cassandra
-  - type: DBComponent
-    matchingValue: java-elasticsearch
-    setValue: elasticsearch
   - type: HTTPComponent
     matchingValue: java-aws-sdk
     setValue: aws-client