diff --git a/index/gn/gnat_arm/gnat_arm-10.3.0-1.toml b/index/gn/gnat_arm_elf/gnat_arm_elf-10.3.0-1.toml
similarity index 89%
rename from index/gn/gnat_arm/gnat_arm-10.3.0-1.toml
rename to index/gn/gnat_arm_elf/gnat_arm_elf-10.3.0-1.toml
index 6f638f6a..ac6cd4e9 100644
--- a/index/gn/gnat_arm/gnat_arm-10.3.0-1.toml
+++ b/index/gn/gnat_arm_elf/gnat_arm_elf-10.3.0-1.toml
@@ -1,13 +1,16 @@
-name = "gnat_arm"
+name = "gnat_arm_elf"
 version = "10.3-1"
 provides = ["gnat=10.3-1"]
-
 description = "The GNAT Ada compiler - ARM cross-compiler"
 maintainers = ["chouteau@adacore.com"]
 maintainers-logins = ["Fabien-Chouteau"]
+licenses = "GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1"
 
 auto-gpr-with = false
 
+[configuration]
+disabled = true
+
 [environment]
 PATH.prepend = "${CRATE_ROOT}/bin"
 
diff --git a/index/gn/gnat/gnat-external.toml b/index/gn/gnat_external/gnat_external-external.toml
similarity index 84%
rename from index/gn/gnat/gnat-external.toml
rename to index/gn/gnat_external/gnat_external-external.toml
index 233d954a..dda3f9d1 100644
--- a/index/gn/gnat/gnat-external.toml
+++ b/index/gn/gnat_external/gnat_external-external.toml
@@ -1,5 +1,5 @@
 description = "GNAT is a compiler for the Ada programming language"
-name = "gnat"
+name = "gnat_external"
 
 maintainers = ["alejandro@mosteo.com"]
 maintainers-logins = ["mosteo"]
@@ -8,8 +8,9 @@ maintainers-logins = ["mosteo"]
 kind = "version-output"
 version-regexp = "^GNAT ([\\d\\.]+).*|^GNAT Community ([\\d]{4}).*"
 version-command = ["gnat", "--version"]
+provides = "gnat"
 
-# We do not want to have system external definitions because is typical systems
+# We do not want to have system external definitions because in 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
diff --git a/index/gn/gnat_linux64/gnat_linux64-10.3.0-1.toml b/index/gn/gnat_linux64/gnat_linux64-10.3.0-1.toml
deleted file mode 100644
index e21b0bd1..00000000
--- a/index/gn/gnat_linux64/gnat_linux64-10.3.0-1.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-name = "gnat_linux64"
-version = "10.3-1"
-description = "The GNAT Ada compiler"
-maintainers = ["chouteau@adacore.com"]
-maintainers-logins = ["Fabien-Chouteau"]
-
-auto-gpr-with = false
-
-provides = ["gnat=10.3-1"]
-
-[environment]
-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_macos64/gnat_macos64-10.3.0-1.toml b/index/gn/gnat_macos64/gnat_macos64-10.3.0-1.toml
deleted file mode 100644
index d08180d1..00000000
--- a/index/gn/gnat_macos64/gnat_macos64-10.3.0-1.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-name = "gnat_macos64"
-version = "10.3-1"
-description = "The GNAT Ada compiler"
-maintainers = ["chouteau@adacore.com"]
-maintainers-logins = ["Fabien-Chouteau"]
-
-auto-gpr-with = false
-
-provides = ["gnat=10.3-1"]
-
-[environment]
-PATH.prepend = "${CRATE_ROOT}/bin"
-
-# Native compiler
-[origin."case(os)".macos."case(word-size)".bits-64]
-url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-10.3.0-1/gnat-x86_64-darwin-10.3.0-1.tar.gz"
-hashes = ["sha256:20b3092f830adda081737e2d66322da8d4ad2bb9f5aa985bd18312d04fc61458"]
diff --git a/index/gn/gnat_native/gnat_native-10.3.0-1.toml b/index/gn/gnat_native/gnat_native-10.3.0-1.toml
new file mode 100644
index 00000000..c3f3e9dc
--- /dev/null
+++ b/index/gn/gnat_native/gnat_native-10.3.0-1.toml
@@ -0,0 +1,28 @@
+name = "gnat_native"
+version = "10.3-1"
+description = "The GNAT Ada compiler - Native"
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+licenses = "GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1"
+
+auto-gpr-with = false
+
+provides = ["gnat=10.3-1"]
+
+[configuration]
+disabled = true
+
+[environment]
+PATH.prepend = "${CRATE_ROOT}/bin"
+
+[origin."case(os)".windows."case(word-size)".bits-64]
+url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-10.3.0-1/gnat-x86_64-windows64-10.3.0-1.tar.gz"
+hashes = ["sha256:6d85b367c642195308440f5b8bdc10b529e2014d58c4ada06e9c8a1f86bf5342"]
+
+[origin."case(os)".macos."case(word-size)".bits-64]
+url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-10.3.0-1/gnat-x86_64-darwin-10.3.0-1.tar.gz"
+hashes = ["sha256:20b3092f830adda081737e2d66322da8d4ad2bb9f5aa985bd18312d04fc61458"]
+
+[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_elf/gnat_riscv64_elf-10.3.0-1.toml
similarity index 89%
rename from index/gn/gnat_riscv64/gnat_riscv64-10.3.0-1.toml
rename to index/gn/gnat_riscv64_elf/gnat_riscv64_elf-10.3.0-1.toml
index 270415e8..1f191e9b 100644
--- a/index/gn/gnat_riscv64/gnat_riscv64-10.3.0-1.toml
+++ b/index/gn/gnat_riscv64_elf/gnat_riscv64_elf-10.3.0-1.toml
@@ -1,13 +1,16 @@
-name = "gnat_riscv64"
+name = "gnat_riscv64_elf"
 version = "10.3-1"
 provides = ["gnat=10.3-1"]
-
 description = "The GNAT Ada compiler - RISC-V cross-compiler"
 maintainers = ["chouteau@adacore.com"]
 maintainers-logins = ["Fabien-Chouteau"]
+licenses = "GPL-3.0-or-later AND GPL-3.0-or-later WITH GCC-exception-3.1"
 
 auto-gpr-with = false
 
+[configuration]
+disabled = true
+
 [environment]
 PATH.prepend = "${CRATE_ROOT}/bin"
 
diff --git a/index/gn/gnat_windows64/gnat_windows64-10.3.0-1.toml b/index/gn/gnat_windows64/gnat_windows64-10.3.0-1.toml
deleted file mode 100644
index 760b6478..00000000
--- a/index/gn/gnat_windows64/gnat_windows64-10.3.0-1.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-name = "gnat_windows64"
-version = "10.3-1"
-description = "The GNAT Ada compiler"
-maintainers = ["chouteau@adacore.com"]
-maintainers-logins = ["Fabien-Chouteau"]
-
-auto-gpr-with = false
-
-provides = ["gnat=10.3-1"]
-
-[environment]
-PATH.prepend = "${CRATE_ROOT}/bin"
-
-# Native compiler
-[origin."case(os)".windows."case(word-size)".bits-64]
-url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-10.3.0-1/gnat-x86_64-windows64-10.3.0-1.tar.gz"
-hashes = ["sha256:6d85b367c642195308440f5b8bdc10b529e2014d58c4ada06e9c8a1f86bf5342"]