diff --git a/docker/rucio_client/scripts/availability_lucene.json b/docker/rucio_client/scripts/availability_lucene.json
index fe03854..5f974e1 100644
--- a/docker/rucio_client/scripts/availability_lucene.json
+++ b/docker/rucio_client/scripts/availability_lucene.json
@@ -35,7 +35,8 @@
       "metadata.kafka_timestamp",
       "data.name",
       "data.status",
-      "data.prod_status"
+      "data.prod_status",
+      "data.rucio_status"
     ]
   },
   "size": 10000,
diff --git a/docker/rucio_client/scripts/setSiteAvailability b/docker/rucio_client/scripts/setSiteAvailability
index af6dd80..7fda749 100755
--- a/docker/rucio_client/scripts/setSiteAvailability
+++ b/docker/rucio_client/scripts/setSiteAvailability
@@ -60,8 +60,8 @@ for site in sites:
             continue  # Until we get good metrics for Tier3s
         if rse in available_map:
             continue
-        ssb_status = site.get('status', None)
-        if not ssb_status or ssb_status != 'enabled':
+        rucio_status = site.get('rucio_status', None)
+        if not rucio_status or rucio_status not in ['dependable', 'enabled']:
             available_map[rse] = False
         else:
             available_map[rse] = True