diff --git a/templates/concurrency_view/ada_pohi_gpr/node.tmplt b/templates/concurrency_view/ada_pohi_gpr/node.tmplt
index ce04fdecd22ffe7235150e24cc3d0a4a580a5458..83298ff95fdfa451e8ee5119708424fbf56685d6 100644
--- a/templates/concurrency_view/ada_pohi_gpr/node.tmplt
+++ b/templates/concurrency_view/ada_pohi_gpr/node.tmplt
@@ -41,7 +41,7 @@ Ada_Drivers_Library/README.md:
 @@ELSE@@
 all:
 	# Configure gprbuild to use GCC toolchain (for C and C++) even if LLVM is installed
-	gprconfig --batch --target=x86_64-pc-linux-gnu --config=C,,,,GCC --config=C++,,,,G++
+	gprconfig --batch --config=Ada,,default,,GNAT --config=C,,default,,GCC --config=C++,,default,,G++ || :
 @@TABLE@@
 	$(GPRBUILD) -p -P @_LOWER:Partition_Names_@.gpr -XTARGET=$(TARGET) -cargs:C -DSTATIC=static -cargs:Ada -gnatE
 @@END_TABLE@@
diff --git a/templates/concurrency_view/c_pohi_gpr/node.tmplt b/templates/concurrency_view/c_pohi_gpr/node.tmplt
index 182a61ff7df23bc7121ef38c9fc4cc7c0220d013..43a92974d995754bbe04cb4fec567d301798d6df 100644
--- a/templates/concurrency_view/c_pohi_gpr/node.tmplt
+++ b/templates/concurrency_view/c_pohi_gpr/node.tmplt
@@ -21,7 +21,7 @@ simulate:
 
 debug_native:
 	# Configure gprbuild to use GCC toolchain even if LLVM is installed
-	gprconfig --batch --target=x86_64-pc-linux-gnu --config=C,,,,GCC --config=C++,,,,G++
+	gprconfig --batch --config=Ada,,default,,GNAT --config=C,,default,,GCC --config=C++,,default,,G++ || :
 @@TABLE@@
 	gprbuild -v -p -P @_LOWER:Partition_Names_@.gpr -XCFG="Debug" -cargs:C -DSTATIC=""
 @@END_TABLE@@