diff --git a/default.xml b/default.xml
index 99b5d58..d4fe5f8 100644
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
   <remote  name="aosp"
            fetch="https://android.googlesource.com"
            review="https://android-review.googlesource.com/" />
-  <default revision="refs/tags/android-8.0.0_r17"
+  <default revision="refs/tags/android-8.0.0_r31"
            remote="aosp"
            sync-c="true"
            sync-j="4" />
diff --git a/omni-aosp.xml b/omni-aosp.xml
index 9ac4ca8..681c158 100644
--- a/omni-aosp.xml
+++ b/omni-aosp.xml
@@ -36,6 +36,7 @@
   <project path="frameworks/base" name="android_frameworks_base" remote="omnirom" revision="android-8.0" />
   <project path="frameworks/native" name="android_frameworks_native" remote="omnirom" revision="android-8.0" />
   <project path="frameworks/opt/telephony" name="android_frameworks_opt_telephony" remote="omnirom" revision="android-8.0" />
+  <project path="frameworks/opt/net/ims" name="android_frameworks_opt_net_ims" remote="omnirom" revision="android-8.0" />
 
   <project path="hardware/interfaces" name="android_hardware_interfaces" remote="omnirom" revision="android-8.0" />
   <project path="hardware/invensense" name="android_hardware_invensense" remote="omnirom" revision="android-8.0" />
@@ -48,14 +49,19 @@
   <project path="hardware/qcom/wlan" name="android_hardware_qcom_wlan" remote="omnirom" revision="android-8.0" />
 
   <project path="packages/apps/Calendar" name="android_packages_apps_Calendar" remote="omnirom" revision="android-8.0" />
+  <project path="packages/apps/Dialer" name="android_packages_apps_Dialer" remote="omnirom" revision="android-8.0" />
   <project path="packages/apps/Launcher3" name="android_packages_apps_Launcher3" remote="omnirom" revision="android-8.0" />
   <project path="packages/apps/Gallery2" name="android_packages_apps_Gallery2" remote="omnirom" revision="android-8.0" />
   <project path="packages/apps/MusicFX" name="android_packages_apps_MusicFX" remote="omnirom" revision="android-8.0" />
   <project path="packages/apps/Nfc" name="android_packages_apps_Nfc" remote="omnirom" revision="android-8.0" />
+  <project path="packages/apps/PhoneCommon" name="android_packages_apps_PhoneCommon" remote="omnirom" revision="android-8.0" />
   <project path="packages/apps/Settings" name="android_packages_apps_Settings" remote="omnirom" revision="android-8.0" />
 
   <project path="packages/inputmethods/LatinIME" name="android_packages_inputmethods_LatinIME" remote="omnirom" revision="android-8.0" />
 
+  <project path="packages/providers/DownloadProvider" name="android_packages_providers_DownloadProvider" remote="omnirom" revision="android-8.0" />
+
+  <project path="packages/services/Telecomm" name="android_packages_services_Telecomm" remote="omnirom" revision="android-8.0" />
   <project path="packages/services/Telephony" name="android_packages_services_Telephony" remote="omnirom" revision="android-8.0" />
 
   <project path="system/bt" name="android_system_bt" remote="omnirom" revision="android-8.0" />
@@ -66,4 +72,5 @@
   <project path="system/netd" name="android_system_netd" remote="omnirom" revision="android-8.0" />
   <project path="system/sepolicy" name="android_system_sepolicy" remote="omnirom" revision="android-8.0" />
   <project path="system/vold" name="android_system_vold" remote="omnirom" revision="android-8.0" />
+  <project path="system/hardware/interfaces" name="android_system_hardware_interfaces" remote="omnirom" revision="android-8.0" />
 </manifest>
diff --git a/remove.xml b/remove.xml
index c58853a..87f8a3f 100644
--- a/remove.xml
+++ b/remove.xml
@@ -66,6 +66,7 @@
   <remove-project name="platform/frameworks/native" />
   <remove-project name="platform/frameworks/opt/emoji" />
   <remove-project name="platform/frameworks/opt/telephony" />
+  <remove-project name="platform/frameworks/opt/net/ims" />
 
   <remove-project name="platform/hardware/intel/audio_media" />
   <remove-project name="platform/hardware/intel/bootstub" />
@@ -97,6 +98,7 @@
 
   <remove-project name="platform/packages/apps/Calendar" />
   <remove-project name="platform/packages/apps/DeskClock" />
+  <remove-project name="platform/packages/apps/Dialer" />
   <remove-project name="platform/packages/apps/Gallery" />
   <remove-project name="platform/packages/apps/Gallery2" />
   <remove-project name="platform/packages/apps/Launcher2" />
@@ -104,12 +106,16 @@
   <remove-project name="platform/packages/apps/Music" />
   <remove-project name="platform/packages/apps/MusicFX" />
   <remove-project name="platform/packages/apps/Nfc" />
+  <remove-project name="platform/packages/apps/PhoneCommon" />
   <remove-project name="platform/packages/apps/Settings" />
 
   <remove-project name="platform/packages/inputmethods/LatinIME" />
 
+  <remove-project name="platform/packages/providers/DownloadProvider" />
+  
+  <remove-project name="platform/packages/services/Telecomm" />
   <remove-project name="platform/packages/services/Telephony" />
-
+  
   <remove-project name="platform/system/bt" />
   <remove-project name="platform/system/core" />
   <remove-project name="platform/system/libhidl" />
@@ -118,4 +124,5 @@
   <remove-project name="platform/system/netd" />
   <remove-project name="platform/system/sepolicy" />
   <remove-project name="platform/system/vold" />
+  <remove-project name="platform/system/hardware/interfaces" />
 </manifest>