diff --git a/dd-java-agent/instrumentation/armeria-grpc/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/build.gradle
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/build.gradle
diff --git a/dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/gradle.lockfile
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ClientCallImplInstrumentation.java
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcClientDecorator.java
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcInjectAdapter.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcInjectAdapter.java
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcInjectAdapter.java
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/GrpcInjectAdapter.java
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcExtractAdapter.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcExtractAdapter.java
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcExtractAdapter.java
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcExtractAdapter.java
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/GrpcServerDecorator.java
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/HandlerRegistryBuilderInstrumentation.java
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/test/groovy/ArmeriaGrpcStreamingTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/src/test/groovy/ArmeriaGrpcStreamingTest.groovy
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcStreamingTest.groovy
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/test/groovy/ArmeriaGrpcTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/src/test/groovy/ArmeriaGrpcTest.groovy
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/groovy/ArmeriaGrpcTest.groovy
diff --git a/dd-java-agent/instrumentation/armeria-grpc/src/test/proto/helloworld.proto b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/proto/helloworld.proto
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-grpc/src/test/proto/helloworld.proto
rename to dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/test/proto/helloworld.proto
diff --git a/dd-java-agent/instrumentation/armeria-jetty/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-jetty/build.gradle
rename to dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle
diff --git a/dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-jetty/gradle.lockfile
rename to dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/gradle.lockfile
diff --git a/dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java
rename to dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaHttpConnectionInstrumentation.java
diff --git a/dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java
rename to dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/ArmeriaJettyInstrumentation.java
diff --git a/dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/AttributeKeys.java b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/AttributeKeys.java
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-jetty/src/main/java/datadog/trace/instrumentation/armeria/jetty/AttributeKeys.java
rename to dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/main/java/datadog/trace/instrumentation/armeria/jetty/AttributeKeys.java
diff --git a/dd-java-agent/instrumentation/armeria-jetty/src/test/jetty11/groovy/ArmeriaJetty11ServerTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/test/jetty11/groovy/ArmeriaJetty11ServerTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-jetty/src/test/jetty11/groovy/ArmeriaJetty11ServerTest.groovy
rename to dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/test/jetty11/groovy/ArmeriaJetty11ServerTest.groovy
diff --git a/dd-java-agent/instrumentation/armeria-jetty/src/test/jetty9/groovy/ArmeriaJetty9ServerTest.groovy b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/test/jetty9/groovy/ArmeriaJetty9ServerTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/armeria-jetty/src/test/jetty9/groovy/ArmeriaJetty9ServerTest.groovy
rename to dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/src/test/jetty9/groovy/ArmeriaJetty9ServerTest.groovy
diff --git a/dd-java-agent/instrumentation/armeria/build.gradle b/dd-java-agent/instrumentation/armeria/build.gradle
new file mode 100644
index 00000000000..5e69c67bd78
--- /dev/null
+++ b/dd-java-agent/instrumentation/armeria/build.gradle
@@ -0,0 +1 @@
+apply from: "$rootDir/gradle/java.gradle"
diff --git a/settings.gradle b/settings.gradle
index cc17a3de79f..57185d3b47e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -217,8 +217,9 @@ include ':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-5.0'
 include ':dd-java-agent:instrumentation:apache-httpcore'
 include ':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0'
 include ':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-5.0'
-include ':dd-java-agent:instrumentation:armeria-grpc'
-include ':dd-java-agent:instrumentation:armeria-jetty'
+include ':dd-java-agent:instrumentation:armeria'
+include ':dd-java-agent:instrumentation:armeria:armeria-grpc-0.84'
+include ':dd-java-agent:instrumentation:armeria:armeria-jetty-1.24'
 include ':dd-java-agent:instrumentation:avro'
 include ':dd-java-agent:instrumentation:aws-common'
 include ':dd-java-agent:instrumentation:aws-java-dynamodb-2.0'