diff --git a/index/gn/gnat/gnat-external.toml b/index/gn/gnat/gnat-external.toml
index 843bd9ca..233d954a 100644
--- a/index/gn/gnat/gnat-external.toml
+++ b/index/gn/gnat/gnat-external.toml
@@ -8,3 +8,9 @@ maintainers-logins = ["mosteo"]
 kind = "version-output"
 version-regexp = "^GNAT ([\\d\\.]+).*|^GNAT Community ([\\d]{4}).*"
 version-command = ["gnat", "--version"]
+
+# We do not want to have system external definitions because is typical systems
+# like Debian/Ubuntu only one version at a time can be installed. Hence using
+# different versions in different crates/configurations would imply messing the
+# users' system. Let them manually configure the compiler they want when they
+# do not want one of the pre-packaged Alire versions.
diff --git a/index/gn/gnat/gnat-10.3.0-1.toml b/index/gn/gnat_linux64/gnat_linux64-10.3.0-1.toml
similarity index 87%
rename from index/gn/gnat/gnat-10.3.0-1.toml
rename to index/gn/gnat_linux64/gnat_linux64-10.3.0-1.toml
index a2addcf8..e221aeab 100644
--- a/index/gn/gnat/gnat-10.3.0-1.toml
+++ b/index/gn/gnat_linux64/gnat_linux64-10.3.0-1.toml
@@ -1,4 +1,4 @@
-name = "gnat"
+name = "gnat_linux64"
 version = "10.3-1"
 description = "The GNAT Ada compiler"
 maintainers = ["chouteau@adacore.com"]
@@ -6,9 +6,12 @@ maintainers-logins = ["Fabien-Chouteau"]
 
 auto-gpr-with = false
 
+provides = ["gnat=10.3-1"]
+
 [environment."case(os)".linux]
 PATH.prepend = "${CRATE_ROOT}/bin"
 
+# Native compiler
 [origin."case(os)".linux."case(word-size)".bits-64]
 url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-10.3.0-1/gnat-x86_64-linux-10.3.0-1.tar.gz"
 hashes = ["sha256:8b7c5dcd858ba01bbb66053bcc2899a7015ef426b0f90d47b5b142b90886a6a2"]
diff --git a/index/gn/gnat_riscv64/gnat_riscv64-10.3.0-1.toml b/index/gn/gnat_riscv64/gnat_riscv64-10.3.0-1.toml
new file mode 100644
index 00000000..28e5b5e0
--- /dev/null
+++ b/index/gn/gnat_riscv64/gnat_riscv64-10.3.0-1.toml
@@ -0,0 +1,16 @@
+name = "gnat_riscv64"
+version = "10.3-1"
+description = "The GNAT Ada compiler - RISC-V cross-compiler"
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+
+auto-gpr-with = false
+
+provides = ["gnat=10.3-1"]
+
+[environment."case(os)".linux]
+PATH.prepend = "${CRATE_ROOT}/bin"
+
+[origin."case(os)".linux."case(word-size)".bits-64]
+url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-10.3.0-1/gnat-riscv64-elf-linux64-10.3.0-1.tar.gz"
+hashes = ["sha256:209ee8df59c3f84412f9cb5121a2df4db45daedce47fbd19f7318461b1a4c00a"]