diff --git a/index/gn/gnatcoll/gnatcoll-2018.0.0.toml b/index/gn/gnatcoll/gnatcoll-2018.0.0.toml
deleted file mode 100644
index 39d09ddc..00000000
--- a/index/gn/gnatcoll/gnatcoll-2018.0.0.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-description = "GNAT Components Collection - Core packages"
-name = "gnatcoll"
-version = "2018.0.0"
-authors = ["AdaCore"]
-licenses = ["GPL 3.0"]
-maintainers = ["derodat@adacore.com"]
-maintainers-logins = ["pmderodat"]
-project-files = ["gnatcoll-core-gpl-2018-src/gnatcoll.gpr"]
-
-[[depends-on]]
-gnat = "^2018"
-
-[gpr-externals]
-BUILD = ["DEBUG", "PROD"]
-GNATCOLL_ATOMICS = ["intrinsic", "mutex"]
-GNATCOLL_OS = ["windows", "unix", "osx"]
-LIBRARY_TYPE = ["relocatable", "static", "static-pic"]
-
-[gpr-set-externals]
-BUILD = "PROD"
-LIBRARY_TYPE = "static-pic"
-[gpr-set-externals."case(os)".linux]
-GNATCOLL_OS = "unix"
-
-[gpr-set-externals."case(os)".macos]
-GNATCOLL_OS = "osx"
-
-[gpr-set-externals."case(os)".windows]
-GNATCOLL_OS = "windows"
-
-[origin]
-url = "https://community.download.adacore.com/v1/213105933eb2deb4d08f6b5beab518ad6c70fbac?filename="
-archive-name = "gnatcoll-core-gpl-2018-20180524-src.tar.gz"
-hashes = ["sha512:bf6082573dc537836ea8506a2c9a75dc7837440c35c5b02a52add52e38290d99e90a9706690591f8899b8b4935824b195f230b3aa1c4da10911e3caf954c04ac"]
diff --git a/index/gn/gnatcoll/gnatcoll-2019.0.0.toml b/index/gn/gnatcoll/gnatcoll-2019.0.0.toml
deleted file mode 100644
index 7bb55914..00000000
--- a/index/gn/gnatcoll/gnatcoll-2019.0.0.toml
+++ /dev/null
@@ -1,34 +0,0 @@
-description = "GNAT Components Collection - Core packages"
-name = "gnatcoll"
-version = "2019.0.0"
-authors = ["AdaCore"]
-licenses = ["GPL 3.0"]
-maintainers = ["derodat@adacore.com"]
-maintainers-logins = ["pmderodat"]
-project-files = ["gnatcoll.gpr"]
-
-[[depends-on]]
-gnat = "^2019"
-
-[gpr-externals]
-BUILD = ["DEBUG", "PROD"]
-GNATCOLL_ATOMICS = ["intrinsic", "mutex"]
-GNATCOLL_OS = ["windows", "unix", "osx"]
-LIBRARY_TYPE = ["relocatable", "static", "static-pic"]
-
-[gpr-set-externals]
-BUILD = "PROD"
-LIBRARY_TYPE = "static-pic"
-[gpr-set-externals."case(os)".linux]
-GNATCOLL_OS = "unix"
-
-[gpr-set-externals."case(os)".macos]
-GNATCOLL_OS = "osx"
-
-[gpr-set-externals."case(os)".windows]
-GNATCOLL_OS = "windows"
-
-[origin]
-url = "https://community.download.adacore.com/v1/99ea2dc09e018deb14f15c00e8c4b7b21f94c94f?filename="
-archive-name = "gnatcoll-core-2019-20190515-24AD8-src.tar.gz"
-hashes = ["sha512:9b2101448b96ac46cebada1fe3cb7b583cbf296f9b7d627771e83c56c78ce72c50ede5474f64f16feba252a18fd46b473901820766902b0c68d63beaf55a884a"]
diff --git a/index/gn/gnatcoll/gnatcoll-21.0.0.toml b/index/gn/gnatcoll/gnatcoll-21.0.0.toml
new file mode 100644
index 00000000..fc852294
--- /dev/null
+++ b/index/gn/gnatcoll/gnatcoll-21.0.0.toml
@@ -0,0 +1,34 @@
+name = "gnatcoll"
+version = "21.0.0"
+description = "GNAT Components Collection - Core packages"
+website = "https://github.com/adacore/gnatcoll-core"
+authors = ["AdaCore"]
+licenses = ["GMGPL 3.0"]
+maintainers = ["chouteau@adacore.com"]
+maintainers-logins = ["Fabien-Chouteau"]
+project-files = ["gnatcoll.gpr"]
+tags = ["gnatcoll", "json", "email", "refcount", "projects", "gpr", "vfs"]
+
+[gpr-externals]
+GNATCOLL_ATOMICS = ["intrinsic", "mutex"]
+GNATCOLL_BUILD_MODE = ["DEBUG", "PROD"]
+GNATCOLL_OS = ["windows", "unix", "osx"]
+LIBRARY_TYPE = ["static", "relocatable", "static-pic"]
+
+
+[gpr-set-externals."case(os)".linux]
+GNATCOLL_OS = "unix"
+[gpr-set-externals."case(os)".macos]
+GNATCOLL_OS = "osx"
+[gpr-set-externals."case(os)".windows]
+GNATCOLL_OS = "windows"
+
+[gpr-set-externals]
+GNATCOLL_VERSION = "21.0.0"
+
+[[depends-on]]
+libgpr = "~21.0.0"
+
+[origin]
+url= "https://github.com/AdaCore/gnatcoll-core/archive/v21.0.0.zip"
+hashes=['sha512:6c0439a39495070c58af1eecd04b450d3f7fae8dfca21ce2200035893467c07b04ec037aeef84b5b1499fe683b9cadeb5425e7373b9d6204d1ed1deb5616d291']
diff --git a/index/gn/gnatcoll/gnatcoll-external.toml b/index/gn/gnatcoll/gnatcoll-external.toml
deleted file mode 100644
index 68ed1001..00000000
--- a/index/gn/gnatcoll/gnatcoll-external.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-description = "GNAT Components Collection - Core packages"
-name = "gnatcoll"
-authors = ["AdaCore"]
-licenses = ["GPL 3.0"]
-maintainers = ["derodat@adacore.com"]
-maintainers-logins = ["pmderodat"]
-
-[[external]]
-kind = "system"
-[external.origin."case(distribution)"]
-"debian|ubuntu" = ["libgnatcoll16.1.0-dev", "libgnatcoll17-dev", "libgnatcoll18-dev"]