diff --git a/roles/nextcloud/tasks/install.yml b/roles/nextcloud/tasks/install.yml
index 7fa429d56..9f6fb0dd6 100644
--- a/roles/nextcloud/tasks/install.yml
+++ b/roles/nextcloud/tasks/install.yml
@@ -44,44 +44,44 @@
 - name: Install ffmpeg + libxml2 + 13 php packages
   package:
     name:
-      #- dnsutils        # NOT REQUESTED by Nextcloud
-      - ffmpeg           # Optional (for preview generation)
-      - libxml2          # php-libxml requires libxml2 >= 2.7.0
+      #- dnsutils    # NOT REQUESTED by Nextcloud
+      - ffmpeg       # Optional (for preview generation)
+      - libxml2      # php-libxml requires libxml2 >= 2.7.0
       #- libapache2-mod-php    # 2020-02-15: NO LONGER NEEDED?
-      - php{{ php_version }}-bz2          # Optional (for extraction of apps)
-      - php{{ php_version }}-cli
+      - php{{ php_version }}-bz2           # Optional (for extraction of apps)
+      - php{{ php_version }}-cli           # Like optional?  @jvonau says this drags in php{{ php_version }}-common as @m-anish wanted in PR #2119 / #2258
       - php{{ php_version }}-curl
       - php{{ php_version }}-gd
-      - php{{ php_version }}-gmp          # Optional (for SFTP storage)
-      - php{{ php_version }}-imagick      # Optional (for preview generation)
-      - php{{ php_version }}-intl         # Optional (increases language translation performance and fixes sorting of non-ASCII characters)
+      - php{{ php_version }}-gmp           # Optional (for SFTP storage)
+      - php{{ php_version }}-imagick       # Optional (for preview generation)
+      - php{{ php_version }}-intl          # Optional (increases language translation performance and fixes sorting of non-ASCII characters)
       - php{{ php_version }}-json
-      #- php-libxml      # NOT INSTALLABLE: ENABLED BY DEFAULT (https://www.php.net/manual/en/libxml.installation.php)
+      #- php{{ php_version }}-libxml       # NOT INSTALLABLE: ENABLED BY DEFAULT (https://www.php.net/manual/en/libxml.installation.php)
       - php{{ php_version }}-mbstring
       - php{{ php_version }}-mysql
-      #- php-openssl     # NOT INSTALLABLE: ENABLED BY DEFAULT?
-      #- php-pdo_mysql   # NOT INSTALLABLE: php-mysql handles this on all OS's?
-      #- php-redis       # @m-anish future work?
-      #- php-session     # NOT INSTALLABLE: ENABLED BY DEFAULT?
-#      - php-smbclient    # Optional (SMB/CIFS integration
-      - php{{ php_version }}-xml          # NOT FORMALLY REQUESTED by Nextcloud (BUT hopefully delivers php-simplexml if not {php-xmlreader, php-xmlwriter} on Raspbian?)
+      #- php{{ php_version }}-openssl      # NOT INSTALLABLE: ENABLED BY DEFAULT?
+      #- php{{ php_version }}-pdo_mysql    # NOT INSTALLABLE: php-mysql handles this on all OS's?
+      #- php{{ php_version }}-redis        # @m-anish future work?
+      #- php{{ php_version }}-session      # NOT INSTALLABLE: ENABLED BY DEFAULT?
+      #- php{{ php_version }}-smbclient    # Optional (SMB/CIFS integration)
+      - php{{ php_version }}-xml           # NOT FORMALLY REQUESTED by Nextcloud (BUT hopefully delivers php-simplexml if not {php-xmlreader, php-xmlwriter} on Raspbian?)
       - php{{ php_version }}-zip
-      #- php-zlib        # NOT INSTALLABLE: ENABLED BY DEFAULT?
+      #- php{{ php_version }}-zlib         # NOT INSTALLABLE: ENABLED BY DEFAULT?
     state: present
 
 # https://docs.nextcloud.com/server/18/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation
 #- name: Install 9 additional php packages, if OS is not Raspbian (these are not available on Raspbian on RPi, as of Feb 2020)
 #  package:
 #    name:
-#      - php-ctype
-#      - php-dom
-#      - php-exif         # Optional (for image rotation in pictures app)
-#      - php-fileinfo     # Optional (enhances file analysis performance)
-#      - php-iconv
-#      - php-posix
-#      - php-simplexml
-#      - php-xmlreader
-#      - php-xmlwriter
+#      - php{{ php_version }}-ctype
+#      - php{{ php_version }}-dom
+#      - php{{ php_version }}-exif        # Optional (for image rotation in pictures app)
+#      - php{{ php_version }}-fileinfo    # Optional (enhances file analysis performance)
+#      - php{{ php_version }}-iconv
+#      - php{{ php_version }}-posix
+#      - php{{ php_version }}-simplexml
+#      - php{{ php_version }}-xmlreader
+#      - php{{ php_version }}-xmlwriter
 #    state: present
 #  when: not is_raspbian