diff --git a/build/tools/roomservice.py b/build/tools/roomservice.py
index 3c44a19..84be610 100755
--- a/build/tools/roomservice.py
+++ b/build/tools/roomservice.py
@@ -359,7 +359,7 @@
 
 def fetch_dependencies(device):
     if device == "emulator":
-        location = "vendor/omni/utils/emulator"
+        location = "vendor/omni/utils/omni_emulator"
     else:
         location = parse_device_from_folder(device)
     if location is None or not os.path.isdir(location):
diff --git a/utils/omni_emulator/omni.dependencies b/utils/omni_emulator/omni.dependencies
index 11bc1ae..0f1007a 100644
--- a/utils/omni_emulator/omni.dependencies
+++ b/utils/omni_emulator/omni.dependencies
@@ -3,36 +3,36 @@
     "remote": "aosp",
     "repository": "device/generic/common",
     "target_path": "device/generic/common",
-    "revision": "refs/tags/android-10.0.0_r14"
+    "revision": "refs/tags/android-11.0.0_r16"
   },
   {
     "remote": "aosp",
     "repository": "device/generic/goldfish",
     "target_path": "device/generic/goldfish",
-    "revision": "refs/tags/android-10.0.0_r14"
+    "revision": "refs/tags/android-11.0.0_r16"
   },
   {
     "remote": "aosp",
     "repository": "device/generic/goldfish-opengl",
     "target_path": "device/generic/goldfish-opengl",
-    "revision": "refs/tags/android-10.0.0_r14"
+    "revision": "refs/tags/android-11.0.0_r16"
   },
   {
     "remote": "aosp",
     "repository": "device/generic/opengl-transport",
     "target_path": "device/generic/opengl-transport",
-    "revision": "refs/tags/android-10.0.0_r14"
-  },
-  {
-    "remote": "aosp",
-    "repository": "device/generic/trusty",
-    "target_path": "device/generic/trusty",
-    "revision": "refs/tags/android-10.0.0_r14"
+    "revision": "refs/tags/android-11.0.0_r16"
   },
   {
     "remote": "aosp",
     "repository": "device/generic/uml",
     "target_path": "device/generic/uml",
-    "revision": "refs/tags/android-10.0.0_r14"
+    "revision": "refs/tags/android-11.0.0_r16"
+  },
+  {
+    "remote": "aosp",
+    "repository": "device/sample",
+    "target_path": "device/sample",
+    "revision": "refs/tags/android-11.0.0_r16"
   }
 ]