diff --git a/app/workers/build_queue_worker.rb b/app/workers/build_queue_worker.rb
index f19290b0c1a1a1d2c9e8cafcedb8e029bc422c9f..1ec020039cfb63ae8b0ba8c20ec182f59ae4f529 100644
--- a/app/workers/build_queue_worker.rb
+++ b/app/workers/build_queue_worker.rb
@@ -9,10 +9,17 @@ class BuildQueueWorker
           # Inject last_update into Redis
           Gitlab::Redis.with do |redis]
             new_update = Time.new.inspect
-            redis.set(current_runner_redis_key, new_update, ex: 60.minutes)
+            redis.set(runner_redis_key(runner), new_update, ex: 60.minutes)
           end
         end
       end
     end
   end
+
+  private
+
+  def runner_redis_key(runner)
+    "#{runner.token}_#{runner.tag_list}"
+  end
+
 end