diff --git a/fdroidserver/data/scanner/suss.json b/fdroidserver/data/scanner/suss.json
index f2479f22..bc58db2a 100644
--- a/fdroidserver/data/scanner/suss.json
+++ b/fdroidserver/data/scanner/suss.json
@@ -1,4 +1,5 @@
 {
+  "cache_duration": 86400,
   "signatures": {
     "admob": {
       "gradle_signatures": [
@@ -137,13 +138,14 @@
     },
     "com.hypertrack": {
       "gradle_signatures": [
-        "com.hypertrack"
+        "com\\.hypertrack(?!:hyperlog)"
       ],
       "license": "NonFree"
     },
     "com.mapbox": {
+      "MaintainerNotes": "com.mapbox.mapboxsdk:mapbox-sdk-services seems to be fully under this license:\nhttps://github.com/mapbox/mapbox-java/blob/main/LICENSE\n",
       "gradle_signatures": [
-        "com.mapbox"
+        "com\\.mapbox(?!\\.mapboxsdk:mapbox-sdk-services)"
       ],
       "license": "NonFree"
     },
@@ -167,7 +169,7 @@
     },
     "com.yandex.android": {
       "gradle_signatures": [
-        "com.yandex.android"
+        "com\\.yandex\\.android(?!:authsdk)"
       ],
       "license": "NonFree"
     },
@@ -191,7 +193,7 @@
     },
     "firebase": {
       "gradle_signatures": [
-        "firebase"
+        "com(\\.google)?\\.firebase[.:](?!firebase-jobdispatcher|geofire-java)"
       ],
       "license": "NonFree"
     },
@@ -286,6 +288,7 @@
       "license": "NonFree"
     }
   },
-  "timestamp": "2022-09-22T13:16:29.313769+00:00",
-  "version": 1
+  "timestamp": "2022-09-29T19:35:04.875586+00:00",
+  "version": 1,
+  "last_updated": "2022-09-30T05:13:18.411707+02:00"
 }
\ No newline at end of file
diff --git a/tests/scanner.TestCase b/tests/scanner.TestCase
index 32274396..c3c70ffe 100755
--- a/tests/scanner.TestCase
+++ b/tests/scanner.TestCase
@@ -54,8 +54,8 @@ class ScannerTest(unittest.TestCase):
             'com.integreight.onesheeld': 11,
             'com.jens.automation2': 2,
             'firebase-suspect': 1,
-            'org.mozilla.rocket': 3,
-            'org.tasks': 3,
+            'org.mozilla.rocket': 1,
+            'org.tasks': 2,
             'realm': 1,
             'se.manyver': 2,
         }