diff --git a/inventory/vagrant/group_vars/webserver/drupal.yml b/inventory/vagrant/group_vars/webserver/drupal.yml
index 3d76b464..74dcbfbf 100644
--- a/inventory/vagrant/group_vars/webserver/drupal.yml
+++ b/inventory/vagrant/group_vars/webserver/drupal.yml
@@ -40,7 +40,6 @@ drupal_enable_modules:
   - media_entity_image
   - devel
   - search_api
-  - carapace
   - islandora_image
   - search_api_solr
   - search_api_solr_defaults
diff --git a/roles/internal/webserver-app/tasks/drupal.yml b/roles/internal/webserver-app/tasks/drupal.yml
index dec86379..c88c9526 100644
--- a/roles/internal/webserver-app/tasks/drupal.yml
+++ b/roles/internal/webserver-app/tasks/drupal.yml
@@ -19,6 +19,19 @@
   register: uninstall_search
   changed_when: "'successfully uninstalled' in uninstall_search.stdout"
 
+- name: Get Carapace status
+  command: "{{ drush_path }} pm-list --format=json"
+  args:
+    chdir: "{{ drupal_core_path }}"
+  register: carapace_enabled
+  changed_when: false
+
+- name: Enable Carapace if not enabled
+  command: "{{ drush_path }} then -y carapace"
+  args:
+    chdir: "{{ drupal_core_path }}"
+  when: ((carapace_enabled.stdout|from_json).carapace.status|lower) != 'enabled'
+
 - name: Test if theme is Carapace
   command: "{{ drush_path }} -y config-get system.theme default"
   args: