diff --git a/index/gn/gnoga/gnoga-2.1.2.toml b/index/gn/gnoga/gnoga-2.1.2.toml
index f20932698..280d6baf6 100644
--- a/index/gn/gnoga/gnoga-2.1.2.toml
+++ b/index/gn/gnoga/gnoga-2.1.2.toml
@@ -17,6 +17,11 @@ gnat = ">=2021 | (>=12 & <2000)"
 simple_components = "^4.62.0"
 uxstrings = "~0.4.0+alpha-20220803"
 
+[gpr-set-externals.'case(os)']
+linux   = { PRJ_TARGET = "Linux" }
+windows = { PRJ_TARGET = "Windows" }
+macos   = { PRJ_TARGET = "OSX" }
+
 [origin]
 commit = "5f127c56986a7a1a562b405d7934eabf8e624c25"
 url = "git+https://github.com/Blady-Com/gnoga.git"
diff --git a/index/si/simple_components/simple_components-4.68.0.toml b/index/si/simple_components/simple_components-4.68.0.toml
index 63cb34959..218127184 100644
--- a/index/si/simple_components/simple_components-4.68.0.toml
+++ b/index/si/simple_components/simple_components-4.68.0.toml
@@ -21,21 +21,15 @@ Target_OS = ["Windows", "Windows_NT", "Linux", "UNIX", "OSX", "FreeBSD", "auto"]
 Tasking = ["Multiple", "Single"] # Default Multiple
 Traced_Objects = ["Off", "On"] # Default Off
 
-[gpr-set-externals."case(os)".freebsd]
-Target_OS = "FreeBSD"
-[gpr-set-externals."case(os)".linux]
-Target_OS = "Linux"
-odbc      = "unixODBC"
-[gpr-set-externals."case(os)".macos]
-Target_OS = "OSX"
-[gpr-set-externals."case(os)".windows]
-Target_OS = "Windows"
-odbc      = "ODBC32"
+[gpr-set-externals."case(os)"]
+freebsd = { Target_OS = "FreeBSD" }
+linux   = { Target_OS = "Linux", odbc = "unixODBC" }
+macos   = { Target_OS = "OSX" }
+windows = { Target_OS = "Windows", odbc = "ODBC32" }
 
 [gpr-set-externals."case(word-size)".bits-32]
-arch = "i686"
-[gpr-set-externals."case(word-size)".bits-64]
-arch = "x86_64"
+bits-32 = { arch = "i686" }
+bits-64 = { arch = "x86_64" }
 
 [origin]
 commit = "da9b0f3a3d56a2e60490fa5f23ca510862c252cd"