diff --git a/apiserver/elastic/mappings/events/events.json b/apiserver/elastic/mappings/events/events.json
index ace61c8..83b379a 100644
--- a/apiserver/elastic/mappings/events/events.json
+++ b/apiserver/elastic/mappings/events/events.json
@@ -1,8 +1,8 @@
 {
   "index_patterns": "events-*",
   "settings": {
-    "number_of_shards": 1,
-    "number_of_replicas": 0
+    "number_of_replicas": 0,
+    "number_of_shards": 1
   },
   "mappings": {
     "_source": {
diff --git a/apiserver/elastic/mappings/workers/queue_metrics.json b/apiserver/elastic/mappings/workers/queue_metrics.json
index af2ab9b..46936ac 100644
--- a/apiserver/elastic/mappings/workers/queue_metrics.json
+++ b/apiserver/elastic/mappings/workers/queue_metrics.json
@@ -1,8 +1,8 @@
 {
   "index_patterns": "queue_metrics_*",
   "settings": {
-    "number_of_shards": 1,
-    "number_of_replicas": 0
+    "number_of_replicas": 0,
+    "number_of_shards": 1
   },
   "mappings": {
     "_source": {
@@ -20,6 +20,9 @@
       },
       "queue_length": {
         "type": "integer"
+      },
+      "company_id": {
+        "type": "keyword"
       }
     }
   }
diff --git a/apiserver/elastic/mappings/workers/worker_stats.json b/apiserver/elastic/mappings/workers/worker_stats.json
index 971fb28..397eb8f 100644
--- a/apiserver/elastic/mappings/workers/worker_stats.json
+++ b/apiserver/elastic/mappings/workers/worker_stats.json
@@ -1,8 +1,8 @@
 {
   "index_patterns": "worker_stats_*",
   "settings": {
-    "number_of_shards": 1,
-    "number_of_replicas": 0
+    "number_of_replicas": 0,
+    "number_of_shards": 1
   },
   "mappings": {
     "_source": {
@@ -32,6 +32,9 @@
       },
       "task": {
         "type": "keyword"
+      },
+      "company_id": {
+        "type": "keyword"
       }
     }
   }
diff --git a/apiserver/tests/automated/test_queues.py b/apiserver/tests/automated/test_queues.py
index 77aff2c..e7a2e71 100644
--- a/apiserver/tests/automated/test_queues.py
+++ b/apiserver/tests/automated/test_queues.py
@@ -9,6 +9,10 @@ from apiserver.tests.automated import TestService, utc_now_tz_aware
 
 
 class TestQueues(TestService):
+    def setUp(self, **kwargs):
+        super().setUp(**kwargs)
+        self.user = self.api.users.get_current_user().user
+
     def test_default_queue(self):
         res = self.api.queues.get_default()
         self.assertIsNotNone(res.id)
@@ -313,4 +317,9 @@ class TestQueues(TestService):
             machine_stats=dict(cpu_usage=[10, 20]),
             task=task["id"],
         )
-        return dict(name=worker, ip="127.0.0.1", task=task)
+        return dict(
+            name=worker,
+            ip="127.0.0.1",
+            task=task,
+            key=f"worker_{self.user.company.id}_{self.user.id}_{worker}"
+        )