diff --git a/inventory/vagrant/group_vars/alpaca.yml b/inventory/vagrant/group_vars/alpaca.yml
index b046b34f..908edd49 100644
--- a/inventory/vagrant/group_vars/alpaca.yml
+++ b/inventory/vagrant/group_vars/alpaca.yml
@@ -1,6 +1,6 @@
 ---
 
-# Comment in to build Alpaca from source
+# Comment out to download Alpaca from Maven
  alpaca_from_source: yes
  alpaca_version: 2.x
  alpaca_clone_directory: /opt/alpaca
diff --git a/roles/internal/Islandora-Devops.alpaca/defaults/main.yml b/roles/internal/Islandora-Devops.alpaca/defaults/main.yml
index d02d1d99..841dfaa9 100644
--- a/roles/internal/Islandora-Devops.alpaca/defaults/main.yml
+++ b/roles/internal/Islandora-Devops.alpaca/defaults/main.yml
@@ -5,8 +5,8 @@ alpaca_version: 2.0.0
 alpaca_clone_directory: /opt/alpaca
 alpaca_jar_path: "{{ alpaca_clone_directory }}/islandora-alpaca-app-{{ alpaca_version }}-all.jar"
 
-alpaca_user: "{{ ansible_ssh_user }}"
-alpaca_group: "{{ ansible_ssh_user }}"
+alpaca_user: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
+alpaca_group: "{{ ansible_ssh_user | default(ansible_env.SUDO_USER, true) | default(ansible_env.USER, true) | default(ansible_user_id) }}"
 
 alpaca_log_level: INFO
 
diff --git a/roles/internal/Islandora-Devops.tomcat8/tasks/main.yml b/roles/internal/Islandora-Devops.tomcat8/tasks/main.yml
index ad93c2a5..4b22bf4d 100644
--- a/roles/internal/Islandora-Devops.tomcat8/tasks/main.yml
+++ b/roles/internal/Islandora-Devops.tomcat8/tasks/main.yml
@@ -12,7 +12,6 @@
     - tomcat9-install
 
 - include: config.yml
-  static: no
   tags:
     - tomcat9
     - tomcat9-config