diff --git a/inventory/vagrant/group_vars/webserver/drupal.yml b/inventory/vagrant/group_vars/webserver/drupal.yml
index 2ac820d9..e87141e5 100644
--- a/inventory/vagrant/group_vars/webserver/drupal.yml
+++ b/inventory/vagrant/group_vars/webserver/drupal.yml
@@ -16,7 +16,7 @@ drupal_composer_dependencies:
   - "drupal/pdf:1.x-dev"
   - "islandora/carapace:1.0.0"
   - "islandora/islandora_defaults:dev-8.x-1.x"
-drupal_composer_project_package: "islandora/drupal-project:8.6.10"
+drupal_composer_project_package: "islandora/drupal-project:8.7"
 drupal_composer_project_options: "--prefer-dist --stability dev --no-interaction"
 drupal_core_path: "{{ drupal_composer_install_dir }}/web"
 drupal_db_user: drupal8
diff --git a/post-install.yml b/post-install.yml
index 70b5a753..ad4f5bb7 100644
--- a/post-install.yml
+++ b/post-install.yml
@@ -9,22 +9,16 @@
     vagrant_user: "{% if ansible_os_family == 'RedHat' %}vagrant{% else %}ubuntu{% endif %}"
 
   tasks:
-    # Some tomfoolery to get the demo module to install.
-    # Subject to https://www.drupal.org/node/2599228
-    # Should be fixed in Drupal 8.7
-    - name: Install islandora_defaults module (fail ok)
-      command: "{{ drush_path }} --root {{ drupal_core_path }} -y en islandora_defaults"
-      ignore_errors: yes
-    - name: Update entities
-      command: "{{ drush_path }} --root {{ drupal_core_path }} -y entity:updates"
-    - name: Uninstall islandora_defaults module
-      command: "{{ drush_path }} --root {{ drupal_core_path }} -y pmu islandora_defaults"
-    - name: Install islandora_defaults module (should not fail)
+
+    - name: Install islandora_defaults module
       command: "{{ drush_path }} --root {{ drupal_core_path }} -y en islandora_defaults"
+
     - name: Import feature
       command: "{{ drush_path }} --root {{ drupal_core_path }} -y fim --bundle=islandora islandora_defaults"
+      
     - name: Add admin to fedoraAdmin role
       command: "{{ drush_path }} --root {{ drupal_core_path }} -y urol fedoraadmin admin"
+      
     - name: Install islandora_search
       command: "{{ drush_path }} --root {{ drupal_core_path }} -y en islandora_search"
 
@@ -39,6 +33,9 @@
       command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml islandora.settings gemini_pseudo_bundles.{{ item.0 }} {{ item.1 }}"
       with_indexed_items: "{{ drupal_gemini_pseudo_bundles }}"
 
+    - name: Set media urls
+      command: "{{ drush_path }} --root {{ drupal_core_path }} -y cset --input-format=yaml media.settings standalone_url true"
+
     - name: Run migrations
       command: "{{ drush_path }} --root {{ drupal_core_path }} -y -l localhost:{{ apache_listen_port }} --userid=1 mim --group=islandora"
 
@@ -64,7 +61,7 @@
         group: "{{ webserver_app_user }}"
         mode: 0775
         recurse: yes
-    
+
     - name: Chown islandora core feature
       file:
         dest: "{{ drupal_core_path }}/modules/contrib/islandora/modules/islandora_core_feature"
@@ -91,3 +88,7 @@
         group: "{{ webserver_app_user }}"
         mode: 0775
         recurse: yes
+
+    - name: Clear cache
+      command: "{{ drush_path }} --root {{ drupal_core_path }} -y cr"
+