diff --git a/.ci/buildDockerImages.groovy b/.ci/buildDockerImages.groovy
index df042e5e9..2d696a105 100644
--- a/.ci/buildDockerImages.groovy
+++ b/.ci/buildDockerImages.groovy
@@ -53,6 +53,7 @@ pipeline {
     booleanParam(name: 'apm_integration_testing', defaultValue: "false", description: "")
     booleanParam(name: 'helm_kubectl', defaultValue: "false", description: "")
     booleanParam(name: 'opbot', defaultValue: "false", description: "")
+    booleanParam(name: 'flakey', defaultValue: "false", description: "Flake detection app")
   }
   stages {
     stage('Cache Weblogic Docker Image'){
@@ -312,6 +313,24 @@ pipeline {
           push: true)
       }
     }
+    stage('Build flakey'){
+      options {
+        skipDefaultCheckout()
+      }
+      when{
+        beforeAgent true
+        expression { return params.flakey}
+      }
+      steps {
+        deleteDir()
+        buildDockerImage(
+          repo: 'https://github.com/elastic/observability-dev',
+          tag: 'flakey',
+          version: 'latest',
+          push: true,
+          folder: "apps/automation/jenkins-toolbox")
+      }
+    }
     stage('Build opbot'){
       options {
         skipDefaultCheckout()
diff --git a/.gitignore b/.gitignore
index 575b5414f..7aa539f5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ local.log
 .classpath
 .project
 .settings/
+
+test-infra/apm-ci/__pycache__/