diff --git a/CHANGELOG.md b/CHANGELOG.md
index 200b41cc..c437005d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ Dropping a requirement of a major version of a dependency is a new contract.
 - Dial down the provisioning logging amount.
 - Enrich the provisioning logging messages.
 - Fix `UriJiraFormula` failing to download results due to zero nodes and zero threads.
+- Improve `stopJira` to wait only for Jira process shutdown instead of all Java processes
 
 [JPERF-595]: https://ecosystem.atlassian.net/browse/JPERF-595
 
diff --git a/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/CustomDatasetSource.kt b/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/CustomDatasetSource.kt
index 8956fabd..62b8f30a 100644
--- a/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/CustomDatasetSource.kt
+++ b/src/main/kotlin/com/atlassian/performance/tools/awsinfrastructure/api/CustomDatasetSource.kt
@@ -88,8 +88,10 @@ class CustomDatasetSource(
 
     private fun stopJira(host: SshHost) {
         val shutdownTomcat = "echo SHUTDOWN | nc localhost 8005"
-        val waitForNoJavaProcess = "while ps -C java -o pid=; do sleep 5; done"
-        Ssh(host, connectivityPatience = 4).newConnection().use { it.safeExecute("$shutdownTomcat && $waitForNoJavaProcess", Duration.ofMinutes(3)) }
+        val waitForNoJiraProcess = "while pgrep -f jira; do sleep 5; done"
+        Ssh(host, connectivityPatience = 4).newConnection().use {
+            it.safeExecute("$shutdownTomcat && $waitForNoJiraProcess", Duration.ofMinutes(3))
+        }
     }
 
     private fun stopDockerContainers(host: SshHost) {