diff --git a/index/as/asis.toml b/index/as/asis.toml
index 6ba5ade5..4611bb72 100644
--- a/index/as/asis.toml
+++ b/index/as/asis.toml
@@ -17,7 +17,7 @@ project-files = ["asis.gpr"]
 
     [[2018.actions]]
     type = "post-fetch"
-    command = "make setup-snames"
+    command = ["make", "setup-snames"]
 
     [2018.available.'case(compiler)']
     gnat-community-2018 = true
@@ -31,7 +31,7 @@ project-files = ["asis.gpr"]
 
     [[2017.actions]]
     type = "post-fetch"
-    command = "make setup-snames"
+    command = ["make", "setup-snames"]
 
     [2017.available.'case(compiler)']
     gnat-community-2018 = true
diff --git a/index/sd/sdlada.toml b/index/sd/sdlada.toml
index 1b8b312b..cd04bb20 100644
--- a/index/sd/sdlada.toml
+++ b/index/sd/sdlada.toml
@@ -23,11 +23,11 @@ project-files = ["build/gnat/sdlada.gpr"]
 
 [[general.actions.'case(os)'.linux]]
 type = "post-fetch"
-command = "make -C build/gnat SDL_PLATFORM=linux SDL_MODE=release"
+command = ["make", "-C", "build/gnat", "SDL_PLATFORM=linux", "SDL_MODE=release"]
 
 [[general.actions.'case(os)'.windows]]
 type = "post-fetch"
-command = "make -C build/gnat SDL_PLATFORM=windows SDL_MODE=release"
+command = ["make", "-C", "build/gnat", "SDL_PLATFORM=windows", "SDL_MODE=release"]
 
 ['2.3.1']
 origin = "https://github.com/Lucretia/sdlada/archive/v2.3.1.tar.gz"
diff --git a/index/te/templates_parser.toml b/index/te/templates_parser.toml
index 65826494..3d664708 100644
--- a/index/te/templates_parser.toml
+++ b/index/te/templates_parser.toml
@@ -20,7 +20,7 @@ maintainers-logins = ["mosteo"]
 
     [[general.actions]]
     type = "post-fetch"
-    command = "cp config/tp_xmlada_installed.gpr tp_xmlada.gpr"
+    command = ["cp", "config/tp_xmlada_installed.gpr", "tp_xmlada.gpr"]
 
 ['17.2']
 origin = "https://github.com/AdaCore/templates-parser/archive/17.2.tar.gz"
diff --git a/index/xm/xmlada.toml b/index/xm/xmlada.toml
index cbca8735..3b254d94 100644
--- a/index/xm/xmlada.toml
+++ b/index/xm/xmlada.toml
@@ -20,11 +20,11 @@ project-files = ["distrib/xmlada.gpr",
 
     [[general.actions]]
     type = "post-fetch"
-    command = "sh configure"
+    command = ["sh", "configure"]
 
     [[general.actions]] # Is ordering preserved by TOML load?
     type = "post-fetch"
-    command = "rm -f xmlada.gpr"
+    command = ["rm", "-f", "xmlada.gpr"]
 
     [general.available.'case(os)']
     windows = false