diff --git a/distribution/build.gradle b/distribution/build.gradle
index 158e7c70091a..301ca89438b9 100644
--- a/distribution/build.gradle
+++ b/distribution/build.gradle
@@ -177,7 +177,7 @@ project.rootProject.subprojects.findAll { it.parent.path == ':modules' }.each {
   }
 
   distro.copyModule(processDefaultOutputsTaskProvider, module)
-  if (module.name.startsWith('transport-')) {
+  if (module.name.startsWith('transport-') || (BuildParams.snapshotBuild == false && module.name == 'apm')) {
     distro.copyModule(processIntegTestOutputsTaskProvider, module)
   }
 
diff --git a/qa/apm/build.gradle b/qa/apm/build.gradle
index 2750f24572b4..e858d43bcbc0 100644
--- a/qa/apm/build.gradle
+++ b/qa/apm/build.gradle
@@ -8,7 +8,9 @@
 
 import org.elasticsearch.gradle.Architecture
 import org.elasticsearch.gradle.VersionProperties
-import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER;
+import org.elasticsearch.gradle.internal.info.BuildParams
+
+import static org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes.DOCKER
 
 apply plugin: 'elasticsearch.standalone-rest-test'
 apply plugin: 'elasticsearch.test.fixtures'
@@ -21,8 +23,7 @@ dependencies {
 }
 
 dockerCompose {
-  environment.put 'STACK_VERSION', VersionProperties.elasticsearch
-  // retainContainersOnStartupFailure = true
+  environment.put 'STACK_VERSION', BuildParams.snapshotBuild ? VersionProperties.elasticsearch : VersionProperties.elasticsearch + "-SNAPSHOT"
 }
 
 elasticsearch_distributions {