diff --git a/roles/nextcloud/defaults/main.yml b/roles/nextcloud/defaults/main.yml
index e49769f72..38392bbb5 100644
--- a/roles/nextcloud/defaults/main.yml
+++ b/roles/nextcloud/defaults/main.yml
@@ -13,10 +13,10 @@ nextcloud_data_dir: "{{ content_base }}/nextcloud/data"
 nextcloud_dl_url: https://download.nextcloud.com/server/releases
 
 # 2019-05-11: latest-16.tar.bz2 finally published to https://download.nextcloud.com/server/releases/ (nextcloud/server#15502) e.g. for Ubuntu 18.04 & Debian 10
-nextcloud_orig_src_file: latest-16.tar.bz2        # 2019-05-16: for Debian 10 & Ubuntu 18.04 where PHP 7.1+ is available
-nextcloud_src_file: nextcloud_{{ nextcloud_orig_src_file }}
-nextcloud_orig_src_file_old: latest-15.tar.bz2    # 2019-05-16: for Debian 9 & Raspbian 9 where PHP 7.1+ isn't available
+nextcloud_orig_src_file_old: latest-15.tar.bz2    # 2019-05-16: for legacy OS's Debian 9 & Raspbian 9 where PHP 7.1+ isn't available
 nextcloud_src_file_old: nextcloud_{{ nextcloud_orig_src_file_old }}
+nextcloud_orig_src_file: latest-16.tar.bz2        # 2019-05-16: for all other OS's e.g. Debian 10 & Ubuntu 18.04 where PHP 7.1+ is hopefully available!
+nextcloud_src_file: nextcloud_{{ nextcloud_orig_src_file }}
 
 # we install on mysql with these setting or those from default_vars, etc.
 nextcloud_dbname: nextcloud