diff --git a/buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt b/buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt
index 19fe737b54..6bded01baf 100644
--- a/buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt
+++ b/buildSrc/src/main/kotlin/com/datadog/gradle/config/MavenConfig.kt
@@ -49,7 +49,7 @@ fun Project.publishingConfig(projectDescription: String) {
 
                 groupId = MavenConfig.GROUP_ID
                 artifactId = projectName
-                version = AndroidConfig.VERSION.name
+                version = AndroidConfig.VERSION.name + "-debug"
 
                 pom {
                     name.set(projectName)
diff --git a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/SampleApplication.kt b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/SampleApplication.kt
index 130abe9061..c1e8220016 100644
--- a/sample/kotlin/src/main/kotlin/com/datadog/android/sample/SampleApplication.kt
+++ b/sample/kotlin/src/main/kotlin/com/datadog/android/sample/SampleApplication.kt
@@ -238,10 +238,13 @@ class SampleApplication : Application() {
             }
             .setResourceEventMapper { event ->
                 event.context?.additionalProperties?.put(ATTR_IS_MAPPED, true)
-                if (KEEP_UPLOAD_REQUEST_AS_RESOURCES) {
-                    event
-                } else {
+                val isDdResource = event.resource.url.contains(
+                    DatadogSite.valueOf(BuildConfig.DD_SITE_NAME).intakeEndpoint
+                )
+                if (isDdResource && !KEEP_UPLOAD_REQUEST_AS_RESOURCES) {
                     null
+                } else {
+                    event
                 }
             }
             .setErrorEventMapper { event ->