diff --git a/roles/nginx/tasks/install.yml b/roles/nginx/tasks/install.yml
index a4b95f0f7..d9f3c4dda 100644
--- a/roles/nginx/tasks/install.yml
+++ b/roles/nginx/tasks/install.yml
@@ -1,7 +1,8 @@
-- name: Stop '{{ apache_service }}' systemd service, in case it exists
+- name: Stop & Disable '{{ apache_service }}' systemd service, in case it exists
   systemd:
     name: "{{ apache_service }}"    # apache2 or httpd, per /opt/iiab/iiab/vars/<OS>.yml
     state: stopped
+    enabled: no
   ignore_errors: yes
   # 'when: apache_installed is defined' insuff b/c mysql's php (etc) can install apache2
 
diff --git a/roles/pbx/tasks/enable-or-disable.yml b/roles/pbx/tasks/enable-or-disable.yml
index 4090d8757..8505b05bd 100644
--- a/roles/pbx/tasks/enable-or-disable.yml
+++ b/roles/pbx/tasks/enable-or-disable.yml
@@ -25,10 +25,19 @@
     command: a2dissite freepbx.conf
     when: not pbx_enabled
 
-  - name: Restart Apache service ({{ apache_service }})
+  - name: Restart & Enable '{{ apache_service }}' systemd service, if pbx_enabled
     systemd:
       name: "{{ apache_service }}"    # apache2
       state: restarted
+      enabled: yes
+    when: pbx_enabled
+
+  - name: Stop & Disable '{{ apache_service }}' systemd service, if not pbx_enabled
+    systemd:
+      name: "{{ apache_service }}"
+      state: stopped
+      enabled: no
+    when: not pbx_enabled
 
   when: not pbx_try_nginx