diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html
index 4be8f680..5131eb8c 100644
--- a/_includes/sections/cloud-storage.html
+++ b/_includes/sections/cloud-storage.html
@@ -4,29 +4,35 @@
   <strong>If you are currently using Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should pick an alternative here.</strong>
 </div>
 
-<div class="row mb-4">
+{% include cardv2.html
+title="Nextcloud - Choose your hoster"
+image="/assets/img/provider/Nextcloud.png"
+description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients."
+website="https://nextcloud.com/"
+forum="https://forum.privacytools.io/t/discussion-nextcloud/287"
+github="https://github.com/nextcloud"
+windows=""
+mac=""
+linux=""
+bsd=""
+ios=""
+android=""
+fire=""
+%}
 
-  {% include card.html color="success"
-  title="Nextcloud - Choose your hoster"
-  image="/assets/img/provider/Nextcloud.png"
+{% include cardv2.html
+title="Least Authority S4 - For Experts"
+image="/assets/img/provider/S4.jpg"
+description="S4 (Simple Secure Storage Service) is Least Authority's verifiably secure off-site backup system for individuals and businesses. 100% client-side encryption and open source transparency. 250GB for $9.95/month or 5TB for $25.95/month. Servers are hosted with Amazon S3 in the US."
+website="https://leastauthority.com/"
+forum="https://forum.privacytools.io/t/discussion-least-authority-s4/288"
+github="https://github.com/LeastAuthority"
+windows=""
+mac=""
+linux=""
+bsd=""
+%}
 
-  description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients."
-
-  url="https://nextcloud.com/"
-  footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux."
-  %}
-
-  {% include card.html color="primary"
-  title="Least Authority S4 - For Experts"
-  image="/assets/img/provider/S4.jpg"
-
-  description="S4 (Simple Secure Storage Service) is Least Authority's verifiably secure off-site backup system for individuals and businesses. 100% client-side encryption and open source transparency. 250GB for $9.95/month or 5TB for $25.95/month. Servers are hosted with Amazon S3 in the US."
-
-  url="https://leastauthority.com/"
-  footer='OS: <a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/Installation">Linux</a>, <a href="https://tahoe-lafs.org/trac/tahoe-lafs/wiki/AdvancedInstall"> Windows, macOS, OpenSolaris, BSD.</a> (Installation for advanced users)'
-  %}
-
-</div>
 
 <h3>Worth Mentioning</h3>