diff --git a/roles/pbx/defaults/main.yml b/roles/pbx/defaults/main.yml
index b5c30773a..ef503225b 100644
--- a/roles/pbx/defaults/main.yml
+++ b/roles/pbx/defaults/main.yml
@@ -1,5 +1,6 @@
 # A full-featured PBX (for rural telephony, etc) based on Asterisk and FreePBX.
-# Works on Ubuntu 18.04, Debian 9 w/ Node.js 10.x.  Experimental on RPi 3.
+# 2019: Worked on Ubuntu 18.04, Debian 9 w/ Node.js 10.x, and seemingly RPi 3+.
+# 2021-08-03: Attempts FreePBX 16 Beta -- as required w/ PHP 7.4 OS's -- #2897
 
 # pbx_install: False
 # pbx_enabled: False
diff --git a/roles/pbx/tasks/freepbx.yml b/roles/pbx/tasks/freepbx.yml
index 7f07b8d0f..711437667 100644
--- a/roles/pbx/tasks/freepbx.yml
+++ b/roles/pbx/tasks/freepbx.yml
@@ -19,12 +19,12 @@
   when: not freepbx_src.stat.exists
 
 - name: FreePBX - Create install source directory
-  file: 
+  file:
     path: "{{ freepbx_src_dir }}"
     state: directory
 
 - name: FreePBX - Extract source
-  unarchive: 
+  unarchive:
     src: "{{ downloads_dir }}/{{ freepbx_src_file }}"
     dest: "{{ freepbx_src_dir }}"
     owner: root
@@ -34,12 +34,12 @@
 
 - name: FreePBX - Patch FreePBX source - IIAB Bug 1685
   patch:
-    src: "roles/pbx/templates/71-freepbx-framework.patch"
+    src: roles/pbx/templates/71-freepbx-framework.patch
     dest: "{{ freepbx_src_dir }}/amp_conf/htdocs/admin/libraries/BMO/Framework.class.php"
 
 - name: FreePBX - Patch FreePBX source - wants [] not {}
   patch:
-    src: "roles/pbx/templates/pbx.patch"
+    src: roles/pbx/templates/pbx.patch
     dest: "{{ freepbx_src_dir }}/amp_conf/htdocs/admin/libraries/Composer/vendor/neitanod/forceutf8/src/ForceUTF8/Encoding.php"
 
 - name: FreePBX - Disable & Stop asterisk service
@@ -55,7 +55,7 @@
     password: "{{ asterisk_db_password }}"
     priv: "{{ asterisk_db_dbname }}.*:ALL/{{ asterisk_db_cdrdbname }}.*:ALL"
 #    login_host: "{{ asterisk_db_host }}"
-#    login_user: "root"
+#    login_user: root
 #    login_password: "{{ mysql_root_password }}"
     host: "{{ (asterisk_db_host == 'localhost') | ternary('localhost', ansible_default_ipv4.address) }}"
     state: present
@@ -66,7 +66,7 @@
     encoding: utf8
     collation: utf8_general_ci
 #    login_host: "{{ asterisk_db_host }}"
-#    login_user: "root"
+#    login_user: root
 #    login_password: "{{ mysql_root_password }}"
     state: present
 
@@ -90,17 +90,17 @@
     create: yes
 
 - name: FreePBX - Create php sessions directory
-  file: 
-    path: "/var/lib/php/asterisk_sessions/"
+  file:
+    path: /var/lib/php/asterisk_sessions/
     state: directory
 
 - name: FreePBX - Set ownership for php sessions directory
-  file: 
-    dest: "/var/lib/php/asterisk_sessions/" 
-    owner: asterisk 
+  file:
+    dest: /var/lib/php/asterisk_sessions/
+    owner: asterisk
     group: asterisk
     recurse: yes
- 
+
 - name: FreePBX - Install (just run once) - CAN TAKE 12 MIN OR LONGER!
   command: ./start_asterisk start
   args:
@@ -113,12 +113,13 @@
     chdir: "{{ freepbx_src_dir }}"
     creates: "{{ freepbx_install_dir }}"
 
-- name: FreePBX - Patch FreePBX source - disable get_magic_quotes_gpc()
-  patch:
-    src: "roles/pbx/templates/pbx2.patch"
-    dest: "{{ freepbx_install_dir }}/admin/libraries/view.functions.php"
+# 2021-08-02: No longer with FreePBX 16?
+#- name: FreePBX - Patch FreePBX source - disable get_magic_quotes_gpc()
+#  patch:
+#    src: roles/pbx/templates/pbx2.patch
+#    dest: "{{ freepbx_install_dir }}/admin/libraries/view.functions.php"
 
-- name: FreePBX - Create /etc/odbc.ini
+- name: FreePBX - Install /etc/odbc.ini from template (root:root, 0644 by default)
   template:
     src: odbc.ini.j2
     dest: /etc/odbc.ini
@@ -126,21 +127,21 @@
     # group: root
     # mode: '0644'
 
-- name: FreePBX - Install Apache's sites-available/freepbx.conf from template
+- name: FreePBX - Install /etc/apache2/sites-available/freepbx.conf from template ({{ apache_user }}:{{ apache_user }}, 0644 by default)
   template:
     src: freepbx.conf.j2
     dest: /etc/apache2/sites-available/freepbx.conf
     owner: "{{ apache_user }}"
     group: "{{ apache_user }}"
-    mode: '0644'
+    # mode: '0644'
 
-- name: FreePBX - Add {{ pbx_http_port }} as a Listen directive to apache ports.conf
+- name: FreePBX - Add directive "Listen {{ pbx_http_port }}" to /etc/apache2/ports.conf
   lineinfile:
     path: /etc/apache2/ports.conf
     line: "Listen {{ pbx_http_port }}"
-    insertafter: Listen 80  
+    #insertafter: Listen 80
 
-- name: FreePBX - Install /etc/systemd/system/freepbx.service systemd unit file from template
+- name: FreePBX - Install /etc/systemd/system/freepbx.service systemd unit file from template (root:root, 0644 by default)
   template:
     src: freepbx.service.j2
     dest: /etc/systemd/system/freepbx.service
diff --git a/roles/pbx/templates/pbx2.patch b/roles/pbx/templates/pbx2.patch.unused
similarity index 100%
rename from roles/pbx/templates/pbx2.patch
rename to roles/pbx/templates/pbx2.patch.unused