diff --git a/.github/workflows/run-system-tests.yaml b/.github/workflows/run-system-tests.yaml
index dc9ece94116..b6ef220da56 100644
--- a/.github/workflows/run-system-tests.yaml
+++ b/.github/workflows/run-system-tests.yaml
@@ -39,6 +39,8 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Build dd-trace-java
+        env:
+          ORG_GRADLE_PROJECT_akkaRepositoryToken: ${{ secrets.AKKA_REPO_TOKEN }}
         run: |
           GRADLE_OPTS="-Xms2g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC" \
           JAVA_HOME=$JAVA_HOME_8_X64 \
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle
index bd84546c308..46516dd0e81 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle
@@ -5,9 +5,7 @@ ext {
 
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: 'scala'
-// temporary workaround to avoid early resolution of test classpath
-// ( Akka instrumentation doesn't require call-site instrumentation )
-// apply plugin: 'call-site-instrumentation'
+apply plugin: 'call-site-instrumentation'
 
 
 muzzle {
@@ -71,10 +69,8 @@ tasks.named("compileLatestDepTestGroovy", GroovyCompile) {
 
 dependencies {
   main_java11CompileOnly libs.scala213
-  main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0-M1'
-  // should be 2.9.0 on compileOnly but this has been temporary downgraded for the CI
-  // for the advice compilation it should not change.
-  main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.8.8'
+  main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
+  main_java11CompileOnly group: 'com.typesafe.akka', name: 'akka-actor_2.13', version: '2.9.0'
 
   //testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
   testImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '10.6.0'
diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile
index c0d04ab66dc..0ecd66941c4 100644
--- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile
+++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/gradle.lockfile
@@ -57,29 +57,24 @@ com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestR
 com.squareup.okio:okio:1.17.5=compileClasspath,csiCompileClasspath,instrumentPluginClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 com.swoval:file-tree-views:2.1.12=zinc
 com.thoughtworks.qdox:qdox:1.12.1=codenarc,latestDepTestRuntimeClasspath,testRuntimeClasspath
-com.typesafe.akka:akka-actor_2.13:2.8.8=main_java11CompileClasspath
 com.typesafe.akka:akka-actor_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
-com.typesafe.akka:akka-actor_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
-com.typesafe.akka:akka-http-core_2.13:10.6.0-M1=main_java11CompileClasspath
-com.typesafe.akka:akka-http-core_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
+com.typesafe.akka:akka-actor_2.13:2.9.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
+com.typesafe.akka:akka-http-core_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
 com.typesafe.akka:akka-http-core_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 com.typesafe.akka:akka-http-jackson_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
 com.typesafe.akka:akka-http-jackson_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 com.typesafe.akka:akka-http-spray-json_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
 com.typesafe.akka:akka-http-spray-json_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
-com.typesafe.akka:akka-http_2.13:10.6.0-M1=main_java11CompileClasspath
-com.typesafe.akka:akka-http_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
+com.typesafe.akka:akka-http_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
 com.typesafe.akka:akka-http_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
-com.typesafe.akka:akka-parsing_2.13:10.6.0-M1=main_java11CompileClasspath
-com.typesafe.akka:akka-parsing_2.13:10.6.0=testCompileClasspath,testRuntimeClasspath
+com.typesafe.akka:akka-parsing_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
 com.typesafe.akka:akka-parsing_2.13:10.7.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 com.typesafe.akka:akka-pki_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 com.typesafe.akka:akka-protobuf-v3_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 com.typesafe.akka:akka-protobuf-v3_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
 com.typesafe.akka:akka-stream_2.13:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
 com.typesafe.akka:akka-stream_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath
-com.typesafe:config:1.4.2=main_java11CompileClasspath
-com.typesafe:config:1.4.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.typesafe:config:1.4.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath
 commons-codec:commons-codec:1.15=spotbugs
 commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
 commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath