diff --git a/_data/downloads.yml b/_data/downloads.yml
index 3e720507d968a550da36dee68246433d8a728c7f..ae0cc97e07dc6be3b630cb15458f6527be9c984f 100644
--- a/_data/downloads.yml
+++ b/_data/downloads.yml
@@ -10,7 +10,8 @@
   cli_version: 0.15.0.1
   gui_version: 0.15.0.1
   gui_installer_version: 0.15.0.1
-  tag: Carbon Chamaeleon
+  cli_tag: Carbon Chamaeleon
+  gui_tag: Carbon Chamaeleon
   blockchain: win
 
 - platform: Windows, 32-bit
@@ -18,7 +19,7 @@
   cli_url: win32
   cli_hash: a3dc6d57c52383fcb83337799909c2c85cc8fe88b127d9408e3ea92880beb38d
   version: 0.15.0.1
-  tag: Carbon Chamaeleon
+  cli_tag: Carbon Chamaeleon
   blockchain: win
 
 - platform: Mac OS X, 64-bit
@@ -30,10 +31,11 @@
   gui_hash: c8994781510e234985e24f465761355e4ae7bd58ef686bd8b0ce4401c2314d51
   cli_version: 0.15.0.1
   gui_version: 0.15.0.1
-  tag: Carbon Chamaeleon
+  cli_tag: Carbon Chamaeleon
+  gui_tag: Carbon Chamaeleon
   blockchain: mac
 
-- platform: Linux, 64-bit
+- platform: Linux, x86_64, 64-bit
   id: linux
   icon: icon-linux
   cli_url: linux64
@@ -42,44 +44,63 @@
   gui_hash: 85a6885849d578691a09834c66ed55af4783ea8347b7784de9ea46e90995a57c
   cli_version: 0.15.0.1
   gui_version: 0.15.0.1
-  tag: Carbon Chamaeleon
+  cli_tag: Carbon Chamaeleon
+  gui_tag: Carbon Chamaeleon
   blockchain: linux
 
-- platform: Linux, 32-bit
+- platform: Linux, x86, 32-bit
   icon: icon-linux
   cli_url: linux32
   cli_hash: f157d8130978772bfe3ec4ebaca21f561dc0deffe49904af49f4a11d96c0cda6
   cli_version: 0.15.0.1
-  tag: Carbon Chamaeleon
+  cli_tag: Carbon Chamaeleon
   blockchain: linux
 
-- platform: FreeBSD, 64-bit
-  id: bsd
-  icon: icon-freebsd
-  cli_url: freebsd64
-  cli_hash: 810dbac09546a14fe6e2c276f41eebc5489bc43f91c0a85a080528ccd9ce12a8
-  version: 0.15.0.1
-  tag: Carbon Chamaeleon
-  blockchain: freebsd
-
-- platform: ARMv8
-  id: arm
+- platform: Linux, ARMv8, 64-bit
+  id: linux
   icon: icon-arm
   cli_url: linuxarm8
   cli_hash: 67b890a10332cd91c69472e345b9ab624532540601a1d99f6fabb9c5c1b62455
   version: 0.15.0.1
-  tag: Carbon Chamaeleon
+  cli_tag: Carbon Chamaeleon
   blockchain: arm
 
-- platform: ARMv7
-  id: arm
+- platform: Linux, ARMv7, 32-bit
+  id: linux
   icon: icon-arm
   cli_url: linuxarm7
   cli_hash: 19c34bf8d79b6ae809efe30a4c02695cd2d8212709a5bff43a5aec49517c41ee
   version: 0.15.0.1
-  tag: Carbon Chamaeleon
+  cli_tag: Carbon Chamaeleon
+  blockchain: arm
+
+- platform: Android, ARMv8, 64-bit
+  id: android
+  icon: icon-arm
+  cli_url: androidarm8
+  cli_hash: f9cbf531049068f9c07b92a89371ff8aab6b69062077c3dfe4fa27a9956f8759
+  version: 0.15.0.1
+  cli_tag: Carbon Chameleon
   blockchain: arm
 
+- platform: Android, ARMv7, 32-bit
+  id: android
+  icon: icon-arm
+  cli_url: androidarm7
+  cli_hash: ea5eac2eed4d10cb35af50182ad11edeeffc4200d2b2b8e47f0283ae06fc4185
+  version: 0.15.0.1
+  cli_tag: Carbon Chameleon
+  blockchain: arm
+
+- platform: FreeBSD, 64-bit
+  id: bsd
+  icon: icon-freebsd
+  cli_url: freebsd64
+  cli_hash: 810dbac09546a14fe6e2c276f41eebc5489bc43f91c0a85a080528ccd9ce12a8
+  version: 0.15.0.1
+  cli_tag: Carbon Chamaeleon
+  blockchain: freebsd
+
 - platform: Source Code & Blockchain
   id: source
   icon: icon-github
diff --git a/downloads/index.md b/downloads/index.md
index 9022b029dc9cc8a9ab3e5d269f210f5fd2076a9d..bbb76ebb074a648ab3ae9efa6c5c85fba1f2f5a3 100644
--- a/downloads/index.md
+++ b/downloads/index.md
@@ -14,7 +14,8 @@ permalink: /downloads/index.html
             <div class="col"><a href="#windows">Windows</a></div>
             <div class="col"><a href="#mac">Mac</a></div>
             <div class="col"><a href="#linux">Linux</a></div>
-            <div class="col"><a href="#arm">Arm (v7 & 8)</a></div>
+            <div class="col"><a href="#android">Android</a></div>
+            <div class="col"><a href="#freebsd">FreeBSD</a></div>
             <div class="col"><a href="#source">{% t downloads.sourceblockchain %}</a></div>
             <div class="col"><a href="#mobilelight">{% t downloads.mobilelight %}</a></div>
             <div class="col"><a href="#hardware">{% t downloads.hardware %}</a></div>
@@ -29,7 +30,8 @@ permalink: /downloads/index.html
               <li><a href="#windows">Windows</a></li>
               <li><a href="#mac">Mac</a></li>
               <li><a href="#linux">Linux</a></li>
-              <li><a href="#arm">Arm (v7 & 8)</a></li>
+              <li><a href="#android">Android</a></li>
+              <li><a href="#freebsd">FreeBSD</a></li>
               <li><a href="#source">{% t downloads.sourceblockchain %}</a></li>
               <li><a href="#mobilelight">{% t downloads.mobilelight %}</a></li>
               <li><a href="#hardware">{% t downloads.hardware %}</a></li>
@@ -86,7 +88,7 @@ permalink: /downloads/index.html
                                 <h3 id="{{ data_downloads.platform | slugify }}">
                                      <a href="//downloads.getmonero.org/cli/{{ data_downloads.cli_url }}"> {{ data_downloads.platform }} {% t downloads.clionly %}</a>
                                 </h3>
-                                <p>{% t downloads.currentversion %}: {{ data_downloads.version }} {{ data_downloads.tag }}</p>
+                                <p>{% t downloads.currentversion %}: {{ data_downloads.version }} {{ data_downloads.cli_tag }}</p>
                             </div>
                          </div>
                         <div class="row">
@@ -100,7 +102,7 @@ permalink: /downloads/index.html
                             <h3 id="{{ data_downloads.platform | slugify }}">
                                 <a href="//downloads.getmonero.org/gui/{{ data_downloads.gui_url }}">{{ data_downloads.platform }}</a>
                             </h3>
-                            <p>{% t downloads.currentversion %}: {{ data_downloads.version }} {{ data_downloads.tag }}</p>
+                            <p>{% t downloads.currentversion %}: {{ data_downloads.version }} {{ data_downloads.gui_tag }}</p>
                         </div>
                         <div class="row">
                             <p class="prehash">SHA256 Hash:</p>
@@ -112,7 +114,7 @@ permalink: /downloads/index.html
                                 <h3 id="{{ data_downloads.platform | slugify }}">
                                     <a href="//downloads.getmonero.org/gui/{{ data_downloads.gui_url }}">{{ data_downloads.platform }}</a>
                                 </h3>
-                                <p>{% t downloads.currentversion %}: {{ data_downloads.gui_version }} {{ data_downloads.tag }}</p>
+                                <p>{% t downloads.currentversion %}: {{ data_downloads.gui_version }} {{ data_downloads.gui_tag }}</p>
                                 <p class="prehash">SHA256 Hash (GUI):</p>
                                 <p class="hash"> {{ data_downloads.gui_hash }}</p>
                             </div>
@@ -120,7 +122,7 @@ permalink: /downloads/index.html
                                 <h3>
                                     <a href="//downloads.getmonero.org/cli/{{ data_downloads.cli_url }}">{{ data_downloads.platform }} {% t downloads.clionly %}</a>
                                 </h3>
-                                <p>{% t downloads.currentversion %}: {{ data_downloads.cli_version }} {{ data_downloads.tag }}</p>
+                                <p>{% t downloads.currentversion %}: {{ data_downloads.cli_version }} {{ data_downloads.cli_tag }}</p>
                                 <p class="prehash">SHA256 Hash (CLI):</p>
                                 <p class="hash"> {{ data_downloads.cli_hash }}</p>
                             </div>
@@ -132,7 +134,7 @@ permalink: /downloads/index.html
                                 <h3 id="{{ data_downloads.platform | slugify }}">
                                     <a href="//downloads.getmonero.org/gui/{{ data_downloads.gui_installer_url }}">{{ data_downloads.platform }} {% t downloads.installer %}</a>
                                 </h3>
-                                <p>{% t downloads.currentversion %}: {{ data_downloads.gui_installer_version }} {{ data_downloads.tag }}</p>
+                                <p>{% t downloads.currentversion %}: {{ data_downloads.gui_installer_version }} {{ data_downloads.gui_tag }}</p>
                                 <p class="prehash">SHA256 Hash (GUI Installer):</p>
                                 <p class="hash"> {{ data_downloads.gui_installer_hash }}</p>
                             </div>