diff --git a/CHANGELOG b/CHANGELOG
index 435cc668f1ed92e17d08cb7b01f6594ff53cb55f..2e4736a0803a349d6aeada77c0e6c7484e3e8fd7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@ v 7.0.0
   - File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
   - Overall performance improvements
   - Skip init script check on omnibus-gitlab
+  - Be more selective when killing stray Sidekiqs
 
 v 6.9.2
   - Revert the commit that broke the LDAP user filter
diff --git a/bin/background_jobs b/bin/background_jobs
index e0140e9689b5a80c093a7452703b63afa2f23a8d..c7ba4398cfbb1d741cc0d0d89950a6af1ee42dec 100755
--- a/bin/background_jobs
+++ b/bin/background_jobs
@@ -18,7 +18,7 @@ function stop
 
 function killall
 {
-  pkill -u $gitlab_user -f sidekiq
+  pkill -u $gitlab_user -f 'sidekiq [0-9]'
 }
 
 function restart