diff --git a/composer.json b/composer.json
index 3f025514..4c2bb60a 100644
--- a/composer.json
+++ b/composer.json
@@ -18,10 +18,10 @@
         "drupal/coder": "^8.3.6",
         "drush/drush": ">=9",
         "mglaman/drupal-check": "^1.2",
-        "palantirnet/phing-drush-task": "^1.1",
+        "palantirnet/phing-drush-task": ">=1.1",
         "pear/http_request2": "^2.3",
         "pear/versioncontrol_git": "@dev",
-        "phing/phing": "^2.14",
+        "phing/phing": "^3.0",
         "phpmd/phpmd": "^2.13",
         "phpspec/prophecy-phpunit": "^2"
     },
@@ -40,9 +40,6 @@
     },
     "extra": {
         "patches": {
-            "phing/phing": {
-                "Support relative symliks in Phing": "https://raw.githubusercontent.com/palantirnet/the-build/7cdc28b6019fb88a0604261366f9ea35f1e21d96/patches/phing-relative-symlinks.patch"
-            }
         }
     }
 }
diff --git a/defaults.yml b/defaults.yml
index b3eafb9a..4bab8687 100644
--- a/defaults.yml
+++ b/defaults.yml
@@ -295,7 +295,8 @@ styleguide:
   # Location of the style guide, relative to the project root.
   root: 'styleguide'
   # Command to compile the style guide assets, for use during the build and artifact steps.
-  command: 'yarn default'
+  command: 'yarn'
+  command_args: 'default'
 
 # Configuration for linting custom javascript.
 #
diff --git a/defaults/install/build.xml b/defaults/install/build.xml
index cdb6ca2c..8376056f 100644
--- a/defaults/install/build.xml
+++ b/defaults/install/build.xml
@@ -105,7 +105,9 @@
     <target name="behat" description="Run the Behat tests.">
         <property name="behat.command" value="${behat.bin} ${behat.args}" />
         <echo msg="$> ${behat.command}" />
-        <exec command="${behat.command}" logoutput="true" checkreturn="true" />
+        <exec executable="${behat.bin}" logoutput="true" checkreturn="true">
+            <arg line="${behat.args}"/>
+        </exec>
     </target>
 
 
@@ -118,11 +120,13 @@
 
         <!-- Run PHP Code Sniffer. -->
         <echo msg="$> vendor/bin/phpcs" />
-        <exec command="vendor/bin/phpcs" logoutput="true" checkreturn="true" />
+        <exec executable="vendor/bin/phpcs" logoutput="true" checkreturn="true" />
 
         <!-- Run PHP Mess Detector. -->
         <echo msg="$> vendor/bin/phpmd" />
-        <exec command="vendor/bin/phpmd ${phpmd.directories} ${phpmd.format} ${phpmd.rulesets} --suffixes ${phpmd.suffixes}" logoutput="true" checkreturn="true" />
+        <exec executable="vendor/bin/phpmd" logoutput="true" checkreturn="true">
+            <arg line="${phpmd.directories} ${phpmd.format} ${phpmd.rulesets} --suffixes=${phpmd.suffixes}"/>
+        </exec>
 
         <!-- Run Drupal Check. -->
         <foreach list="${drupal-check.directories}" param="drupal-check.dir" target="drupal-check" />
@@ -131,7 +135,9 @@
         <phingcall target="eslint" />
 
         <!-- Ensure the composer.lock file is up to date -->
-        <exec command="composer validate --no-check-all --no-check-publish" logoutput="true" checkreturn="true" />
+        <exec executable="composer validate" logoutput="true" checkreturn="true">
+            <arg line="--no-check-all --no-check-publish"/>
+        </exec>
     </target>
 
 
@@ -142,14 +148,16 @@
         <property name="drupal-check.command" value="${drupal-check.bin} ${drupal-check.dir}" />
 
         <echo msg="$> ${drupal-check.command}" />
-        <exec command="${drupal-check.command}" logoutput="true" checkreturn="true" />
+        <exec executable="${drupal-check.command}" logoutput="true" checkreturn="true" />
     </target>
 
     <!-- Target: eslint -->
     <target name="eslint" depends="install-node-dependencies">
         <!-- Lint custom module and theme (by default) javascript. -->
         <echo msg="$> yarn run eslint --ext ${eslint.extensions} ${eslint.directory}" />
-        <exec command="yarn run eslint --fix-dry-run --ext ${eslint.extensions} --no-error-on-unmatched-pattern ${eslint.directory}" logoutput="true" checkreturn="true" />
+        <exec executable="yarn run eslint" logoutput="true" checkreturn="true" >
+            <arg line="--fix-dry-run --ext ${eslint.extensions} --no-error-on-unmatched-pattern ${eslint.directory}"/>
+        </exec>
     </target>
 
 
@@ -157,13 +165,13 @@
     <target name="code-fix" description="Run the automated code fixer.">
         <!-- Run PHP Code Beautifier and Fixer. -->
         <echo msg="$> vendor/bin/phpcbf" />
-        <exec command="vendor/bin/phpcbf" logoutput="true" checkreturn="false" />
+        <exec executable="vendor/bin/phpcbf" logoutput="true" checkreturn="false" />
     </target>
 
     <!-- Target: install-node-dependencies -->
     <target name="install-node-dependencies" depends="" description="Install project, core, and custom module node dependencies">
         <echo msg="Install project node dependencies to get eslint libraries." />
-        <exec dir="${drupal.root}/.." command="yarn install" logoutput="true" />
+        <exec dir="${drupal.root}/.." executable="yarn install" logoutput="true" />
     </target>
 
 
@@ -177,7 +185,9 @@
 
     <!-- Default target: list -->
     <target name="list" hidden="true">
-        <exec command="${phing.home}/bin/phing -q -f ${phing.file} -l" passthru="true"/>
+        <exec executable="${phing.home}/bin/phing" passthru="true">
+            <arg line="-q -f ${phing.file} -l"/>
+        </exec>
         <echo>Find more documentation for palantirnet/the-build on GitHub:
 
             https://github.com/palantirnet/the-build#using-the-build</echo>
diff --git a/src/TheBuild/Acquia/GetLatestBackupTask.php b/src/TheBuild/Acquia/GetLatestBackupTask.php
index 03b2589f..121844b3 100644
--- a/src/TheBuild/Acquia/GetLatestBackupTask.php
+++ b/src/TheBuild/Acquia/GetLatestBackupTask.php
@@ -7,6 +7,8 @@
 use AcquiaCloudApi\Endpoints\Applications;
 use AcquiaCloudApi\Endpoints\DatabaseBackups;
 use AcquiaCloudApi\Endpoints\Environments;
+use Phing\Exception\BuildException;
+use Phing\Io\File;
 
 /**
  * Fetch a recent backup from Acquia.
@@ -16,7 +18,7 @@ class GetLatestBackupTask extends \Task {
   /**
    * Required. Directory for storing downloaded database backups.
    *
-   * @var \PhingFile
+   * @var \Phing\Io\File
    */
   protected $dir;
 
@@ -50,8 +52,8 @@ class GetLatestBackupTask extends \Task {
   /**
    * {@inheritdoc}
    *
-   * @throws \IOException
-   * @throws \NullPointerException
+   * @throws \Phing\Io\IOException
+   * @throws \HTTP_Request2_Exception
    */
   public function main() {
     $this->validate();
@@ -77,7 +79,7 @@ private function getAcquiaCloudCredentials() {
       $this->log("Couldn't find ACQUIA_CLOUD_API_SECRET env variable.");
     }
     if (!$api_key || !$api_secret) {
-      throw new \BuildException("Credentials are required.");
+      throw new BuildException("Credentials are required.");
     }
 
     return [
@@ -185,7 +187,7 @@ public function setDatabase(string $value) {
    *   Directory path.
    */
   public function setDir(string $value) {
-    $this->dir = new \PhingFile($value);
+    $this->dir = new File($value);
   }
 
   /**
@@ -200,7 +202,7 @@ protected function validate() {
     // Check the build attributes.
     foreach (['dir', 'site', 'env'] as $attribute) {
       if (empty($this->$attribute)) {
-        throw new \BuildException("$attribute attribute is required.");
+        throw new BuildException("$attribute attribute is required.");
       }
     }
   }
diff --git a/src/TheBuild/CopyPropertiesTask.php b/src/TheBuild/CopyPropertiesTask.php
index c65aa17a..dce1278c 100644
--- a/src/TheBuild/CopyPropertiesTask.php
+++ b/src/TheBuild/CopyPropertiesTask.php
@@ -2,10 +2,14 @@
 
 namespace TheBuild;
 
+use Phing\Task;
+use Phing\Exception\BuildException;
+use Phing\Util\StringHelper;
+
 /**
  * Copy properties matching a prefix to properties with a different prefix.
  */
-class CopyPropertiesTask extends \Task {
+class CopyPropertiesTask extends Task {
 
   /**
    * Prefix for properties to copy.
@@ -59,11 +63,11 @@ public function main() {
    */
   public function validate() {
     if (empty($this->fromPrefix)) {
-      throw new \BuildException("fromPrefix attribute is required.", $this->location);
+      throw new BuildException("fromPrefix attribute is required.", $this->getLocation());
     }
 
     if (empty($this->toPrefix)) {
-      throw new \BuildException("toPrefix attribute is required.", $this->location);
+      throw new BuildException("toPrefix attribute is required.", $this->getLocation());
     }
   }
 
@@ -74,7 +78,7 @@ public function validate() {
    *   Prefix to copy properties from.
    */
   public function setFromPrefix($prefix) {
-    if (!\StringHelper::endsWith(".", $prefix)) {
+    if (!StringHelper::endsWith(".", $prefix)) {
       $prefix .= ".";
     }
 
@@ -88,7 +92,7 @@ public function setFromPrefix($prefix) {
    *   Prefix to copy properties into.
    */
   public function setToPrefix($prefix) {
-    if (!\StringHelper::endsWith(".", $prefix)) {
+    if (!StringHelper::endsWith(".", $prefix)) {
       $prefix .= ".";
     }
 
diff --git a/src/TheBuild/ForeachKeyTask.php b/src/TheBuild/ForeachKeyTask.php
index 3c148dc0..859378c3 100644
--- a/src/TheBuild/ForeachKeyTask.php
+++ b/src/TheBuild/ForeachKeyTask.php
@@ -2,10 +2,14 @@
 
 namespace TheBuild;
 
+use Phing\Task;
+use Phing\Exception\BuildException;
+use Phing\Util\StringHelper;
+
 /**
  * Phing task to run a target for each property in an array.
  */
-class ForeachKeyTask extends \Task {
+class ForeachKeyTask extends Task {
 
   /**
    * Prefix of properties to iterate over.
@@ -45,7 +49,7 @@ class ForeachKeyTask extends \Task {
   /**
    * Instance of PhingCallTask to use/run.
    *
-   * @var \PhingCallTask
+   * @var \Phing\Task\System\PhingCallTask
    */
   protected $callee;
 
@@ -109,7 +113,7 @@ public function main() {
   public function validate() {
     foreach (['prefix', 'target', 'keyParam', 'prefixParam'] as $attribute) {
       if (empty($this->$attribute)) {
-        throw new \BuildException("$attribute attribute is required.", $this->location);
+        throw new BuildException("$attribute attribute is required.", $this->getLocation());
       }
     }
   }
@@ -121,7 +125,7 @@ public function validate() {
    *   The key prefix.
    */
   public function setPrefix($value) {
-    if (!\StringHelper::endsWith(".", $value)) {
+    if (!StringHelper::endsWith(".", $value)) {
       $value .= ".";
     }
 
diff --git a/src/TheBuild/IncludeResourceTask.php b/src/TheBuild/IncludeResourceTask.php
index aba4328c..70503159 100644
--- a/src/TheBuild/IncludeResourceTask.php
+++ b/src/TheBuild/IncludeResourceTask.php
@@ -2,10 +2,14 @@
 
 namespace TheBuild;
 
+use Phing\Task;
+use Phing\Exception\BuildException;
+use Phing\Io\File;
+
 /**
  * Copy or symlink a file or directory, depending on a flag.
  */
-class IncludeResourceTask extends \Task {
+class IncludeResourceTask extends Task {
 
   /**
    * Either 'symlink' or 'copy'.
@@ -17,14 +21,14 @@ class IncludeResourceTask extends \Task {
   /**
    * The source file or directory to include.
    *
-   * @var \PhingFile
+   * @var \Phing\Io\File
    */
   protected $source;
 
   /**
    * The location to link the file to.
    *
-   * @var \PhingFile
+   * @var \Phing\Io\File
    */
   protected $dest = NULL;
 
@@ -63,11 +67,11 @@ public function main() {
       $this->log("Replacing existing resource '" . $this->dest->getPath() . "'");
 
       if ($this->dest->delete(TRUE) === FALSE) {
-        throw new \BuildException("Failed to delete existing destination '$this->dest'");
+        throw new BuildException("Failed to delete existing destination '$this->dest'");
       }
     }
 
-    // Link or copy the source artifact. @phpstan-ignore-next-line
+    // Link or copy the source artifact.
     $this->dest->getParentFile()->mkdirs();
     if ($this->mode == 'copy') {
       $this->log(sprintf("Copying '%s' to '%s'", $this->source->getPath(), $this->dest->getPath()));
@@ -75,7 +79,7 @@ public function main() {
     }
     else {
       $this->log(sprintf("Linking '%s' to '%s'", $this->source->getPath(), $this->dest->getPath()));
-      /** @var \SymlinkTask $symlink_task */
+      /** @var \Phing\Task\System\SymlinkTask $symlink_task */
       $symlink_task = $this->project->createTask("symlink");
       $symlink_task->setTarget($this->source->getPath());
       $symlink_task->setLink($this->dest->getPath());
@@ -89,11 +93,11 @@ public function main() {
    */
   public function validate() {
     if (!in_array($this->mode, ['symlink', 'copy'])) {
-      throw new \BuildException("mode attribute must be either 'symlink' or 'copy'", $this->location);
+      throw new BuildException("mode attribute must be either 'symlink' or 'copy'", $this->getLocation());
     }
 
     if (empty($this->source) || empty($this->dest)) {
-      throw new \BuildException("Both the 'source' and 'dest' attributes are required.");
+      throw new BuildException("Both the 'source' and 'dest' attributes are required.");
     }
   }
 
@@ -110,12 +114,12 @@ public function setMode(string $mode) {
   /**
    * Set the source of the resource to include.
    *
-   * @param \PhingFile $source
+   * @param \Phing\Io\File $source
    *   Source file.
    */
-  public function setSource(\PhingFile $source) {
+  public function setSource(File $source) {
     if (!$source->exists()) {
-      throw new \BuildException("resource '$source' is not available'");
+      throw new BuildException("resource '$source' is not available'");
     }
 
     $this->source = $source;
@@ -124,10 +128,10 @@ public function setSource(\PhingFile $source) {
   /**
    * Set the destination for the resource.
    *
-   * @param \PhingFile $dest
+   * @param \Phing\Io\File $dest
    *   File destination.
    */
-  public function setDest(\PhingFile $dest) {
+  public function setDest(File $dest) {
     $this->dest = $dest;
   }
 
diff --git a/src/TheBuild/MenuInputRequest.php b/src/TheBuild/MenuInputRequest.php
index 325bc763..6bc4617c 100644
--- a/src/TheBuild/MenuInputRequest.php
+++ b/src/TheBuild/MenuInputRequest.php
@@ -2,10 +2,12 @@
 
 namespace TheBuild;
 
+use Phing\Input\InputRequest;
+
 /**
  * Input interface that prompts the user to select from a menu of options.
  */
-class MenuInputRequest extends \InputRequest {
+class MenuInputRequest extends InputRequest {
 
   /**
    * Prompt to display with the menu.
diff --git a/src/TheBuild/SelectOneTask.php b/src/TheBuild/SelectOneTask.php
index 2c298356..445e035d 100644
--- a/src/TheBuild/SelectOneTask.php
+++ b/src/TheBuild/SelectOneTask.php
@@ -2,10 +2,14 @@
 
 namespace TheBuild;
 
+use Phing\Task;
+use Phing\Exception\BuildException;
+use Phing\Project;
+
 /**
  * Allow the user to select one option from a list.
  */
-class SelectOneTask extends \Task {
+class SelectOneTask extends Task {
 
   /**
    * Required. List of values to select among.
@@ -44,7 +48,7 @@ public function main() {
     $project = $this->getProject();
 
     if ($existing_value = $this->project->getProperty($this->propertyName)) {
-      $this->log("Using {$this->propertyName} = '{$existing_value}' (existing value)", \Project::MSG_INFO);
+      $this->log("Using {$this->propertyName} = '{$existing_value}' (existing value)", Project::MSG_INFO);
       return;
     }
 
@@ -63,7 +67,7 @@ public function main() {
     }
     elseif (count($keys) == 1) {
       $value = current($keys);
-      $this->log("Using {$this->propertyName} = '{$value}' (one value found)", \Project::MSG_INFO);
+      $this->log("Using {$this->propertyName} = '{$value}' (one value found)", Project::MSG_INFO);
     }
 
     if ($value) {
@@ -77,7 +81,7 @@ public function main() {
   public function validate() {
     foreach (['list', 'propertyName'] as $attribute) {
       if (empty($this->$attribute)) {
-        throw new \BuildException("$attribute attribute is required.", $this->location);
+        throw new BuildException("$attribute attribute is required.", $this->getLocation());
       }
     }
   }
diff --git a/src/TheBuild/SelectPropertyKeyTask.php b/src/TheBuild/SelectPropertyKeyTask.php
index 86ae06bf..ceeb290d 100644
--- a/src/TheBuild/SelectPropertyKeyTask.php
+++ b/src/TheBuild/SelectPropertyKeyTask.php
@@ -2,10 +2,15 @@
 
 namespace TheBuild;
 
+use Phing\Task;
+use Phing\Exception\BuildException;
+use Phing\Util\StringHelper;
+use Phing\Project;
+
 /**
  * Interactively select an option from an array of property keys.
  */
-class SelectPropertyKeyTask extends \Task {
+class SelectPropertyKeyTask extends Task {
 
   /**
    * Required. Prefix for properties to copy.
@@ -43,7 +48,7 @@ public function main() {
     $project = $this->getProject();
 
     if ($existing_value = $this->project->getProperty($this->propertyName)) {
-      $this->log("Using {$this->propertyName} = '{$existing_value}' (existing value)", \Project::MSG_INFO);
+      $this->log("Using {$this->propertyName} = '{$existing_value}' (existing value)", Project::MSG_INFO);
       return;
     }
 
@@ -74,10 +79,10 @@ public function main() {
     }
     elseif (count($keys) == 1) {
       $value = current($keys);
-      $this->log("Using {$this->propertyName} = '{$value}' (one value found)", \Project::MSG_INFO);
+      $this->log("Using {$this->propertyName} = '{$value}' (one value found)", Project::MSG_INFO);
     }
     else {
-      $this->log("No properties found with prefix '{$this->prefix}'", \Project::MSG_WARN);
+      $this->log("No properties found with prefix '{$this->prefix}'", Project::MSG_WARN);
     }
 
     if ($value) {
@@ -91,7 +96,7 @@ public function main() {
   public function validate() {
     foreach (['prefix', 'propertyName'] as $attribute) {
       if (empty($this->$attribute)) {
-        throw new \BuildException("$attribute attribute is required.", $this->location);
+        throw new BuildException("$attribute attribute is required.", $this->getLocation());
       }
     }
   }
@@ -103,7 +108,7 @@ public function validate() {
    *   Keys with this prefix will be provided as options.
    */
   public function setPrefix($value) {
-    if (!\StringHelper::endsWith(".", $value)) {
+    if (!StringHelper::endsWith(".", $value)) {
       $value .= ".";
     }
 
diff --git a/targets/artifact.xml b/targets/artifact.xml
index d4ca2bd6..9465b1ab 100644
--- a/targets/artifact.xml
+++ b/targets/artifact.xml
@@ -32,14 +32,22 @@
 
         <!-- Get the current commit, branch, message, and tag so that they can be used to label the
              resulting artifact and reset the repository after the artifact is built. -->
-        <exec command="git rev-parse HEAD" outputProperty="artifact.git.commit" checkreturn="true" />
+        <exec executable="git" outputProperty="artifact.git.commit" checkreturn="true">
+            <arg line="rev-parse HEAD"/>
+        </exec>
         <!-- @TODO Handle the case when this command outputs "HEAD". This happens when
              building a repo from a detatched head state (e.g. you've checked out a tag),
              and it causes pushing the artifact to fail because "HEAD" is not a branch you
              can push to. -->
-        <exec command="git rev-parse --abbrev-ref HEAD" outputProperty="artifact.git.branch" checkreturn="true" />
-        <exec command="git log -1 --oneline" outputProperty="artifact.git.commit_message" />
-        <exec command="git describe --tags --exact-match" outputProperty="artifact.git.tag" returnProperty="artifact.git.no_tag" />
+        <exec executable="git" outputProperty="artifact.git.branch" checkreturn="true">
+            <arg line="rev-parse --abbrev-ref HEAD"/>
+        </exec>
+        <exec executable="git" outputProperty="artifact.git.commit_message">
+            <arg line="log -1 --oneline"/>
+        </exec>
+        <exec executable="git" outputProperty="artifact.git.tag" returnProperty="artifact.git.no_tag">
+            <arg line="describe --tags --exact-match"/>
+        </exec>
 
         <!-- Create a temporary branch name based on the commit for building the artifact,
              to avoid branch conflicts. -->
@@ -89,7 +97,9 @@
         <!-- Prevent an artifact from being built when there are changes that are not
              committed to git, since those changes wouldn't be replicable in later builds.
              -->
-        <exec command="git status --porcelain" outputProperty="modified_files" />
+        <exec executable="git" outputProperty="modified_files">
+            <arg line="status --porcelain"/>
+        </exec>
         <if>
             <not><equals arg1="${modified_files}" arg2="" /></not>
             <then>
@@ -104,7 +114,10 @@
         </if>
 
         <!-- Check that our artifact directory either doesn't exist or is the right repo -->
-        <exec command="[ -d '${artifact.directory}' ] &amp;&amp; git -C '${artifact.directory}' remote show ${artifact.git.remote_name} -n | grep '${artifact.git.remote}'" returnProperty="artifact_repo_has_remote.error" />
+        <exec executable="bash" returnProperty="artifact_repo_has_remote.error">
+            <arg value="-c"/>
+            <arg line="[ -d '${artifact.directory}' ] &amp;&amp; git -C '${artifact.directory}' remote show ${artifact.git.remote_name} -n | grep '${artifact.git.remote}'"/>
+        </exec>
         <if>
             <not><available file="${artifact.directory}" type="dir" /></not>
             <then><echo>Artifact repository:  does not exist (will be created)</echo></then>
@@ -161,29 +174,47 @@
         </if>
 
         <!-- Wipe out any local customizations. -->
-        <exec dir="${artifact.directory}" command="chmod -R 750 ." checkreturn="true" logoutput="true" />
-        <exec dir="${artifact.directory}" command="git reset --hard" checkreturn="true" logoutput="true" />
-        <exec dir="${artifact.directory}" command="git checkout ${artifact.git.remote_base_branch}" checkreturn="true" />
-        <exec dir="${artifact.directory}" command="git clean -ffd" checkreturn="true" />
+        <exec dir="${artifact.directory}" executable="chmod" checkreturn="true" logoutput="true">
+            <arg line="-R 750 ."/>
+        </exec>
+        <exec dir="${artifact.directory}" executable="git" checkreturn="true" logoutput="true">
+            <arg line="reset --hard"/>
+        </exec>
+        <exec dir="${artifact.directory}" executable="git" checkreturn="true">
+            <arg line="checkout ${artifact.git.remote_base_branch}"/>
+        </exec>
+        <exec dir="${artifact.directory}" executable="git" checkreturn="true">
+            <arg line="clean -ffd"/>
+        </exec>
     </target>
 
 
     <target name="artifact-setupBranch" hidden="true">
-        <exec dir="${artifact.directory}" command="git fetch ${artifact.git.remote_name} ${artifact.git.remote_branch}" returnProperty="remote_fetch.error" />
+        <exec dir="${artifact.directory}" executable="git" returnProperty="remote_fetch.error">
+            <arg line="fetch ${artifact.git.remote_name} ${artifact.git.remote_branch}"/>
+        </exec>
         <if>
             <not><equals arg1="${remote_fetch.error}" arg2="0" /></not>
             <then>
                 <echo>Remote branch does not exist. Creating '${artifact.git.remote_branch}' on remote repository...</echo>
-                <exec dir="${artifact.directory}" command="git fetch ${artifact.git.remote_name} ${artifact.git.remote_base_branch}" returnProperty="remote_fetch_base.error" />
+                <exec dir="${artifact.directory}" executable="git" returnProperty="remote_fetch_base.error">
+                    <arg line="fetch ${artifact.git.remote_name} ${artifact.git.remote_base_branch}"/>
+                </exec>
                 <if>
                     <not><equals arg1="${remote_fetch_base.error}" arg2="0" /></not>
                     <then><fail msg="Failed to create remote branch: base branch '${artifact.git.remote_base_branch}' could not be fetched." /></then>
                 </if>
 
                 <!-- The 'remote branch' should only exist on the remote, so we create, push, then delete the local copy. -->
-                <exec dir="${artifact.directory}" command="git branch ${artifact.git.remote_branch} ${artifact.git.remote_name}/${artifact.git.remote_base_branch}" checkreturn="true" />
-                <exec dir="${artifact.directory}" command="git push ${artifact.git.remote_name} ${artifact.git.remote_branch}:${artifact.git.remote_branch}" checkreturn="true" />
-                <exec dir="${artifact.directory}" command="git branch -d ${artifact.git.remote_branch}" checkreturn="true" />
+                <exec dir="${artifact.directory}" executable="git" checkreturn="true">
+                    <arg line="branch ${artifact.git.remote_branch} ${artifact.git.remote_name}/${artifact.git.remote_base_branch}"/>
+                </exec>
+                <exec dir="${artifact.directory}" executable="git" checkreturn="true">
+                    <arg line="push ${artifact.git.remote_name} ${artifact.git.remote_branch}:${artifact.git.remote_branch}"/>
+                </exec>
+                <exec dir="${artifact.directory}" executable="git" checkreturn="true">
+                    <arg line="branch -d ${artifact.git.remote_branch}"/>
+                </exec>
                 <echo>Remote branch '${artifact.git.remote_name}/${artifact.git.remote_branch}' created.</echo>
             </then>
         </if>
@@ -192,9 +223,16 @@
              branch available locally. Now create a fresh, temporary branch for our
              artifact work, to avoid naming conflicts and allow clean rebuilds. -->
         <!-- If the build failed previously, there might be an abandoned branch for this build. -->
-        <exec dir="${artifact.directory}" command="git branch | grep ${artifact.git.temporary_branch} &amp;&amp; git branch -D ${artifact.git.temporary_branch}" logoutput="true" />
-        <exec dir="${artifact.directory}" command="git branch ${artifact.git.temporary_branch} ${artifact.git.remote_name}/${artifact.git.remote_branch}" checkreturn="true" logoutput="true" />
-        <exec dir="${artifact.directory}" command="git checkout ${artifact.git.temporary_branch}" checkreturn="true" />
+        <exec dir="${artifact.directory}" executable="bash" logoutput="true">
+            <arg value="-c"/>
+            <arg line="git branch | grep ${artifact.git.temporary_branch} &amp;&amp; git branch -D ${artifact.git.temporary_branch}"/>
+        </exec>
+        <exec dir="${artifact.directory}" executable="git" checkreturn="true" logoutput="true">
+            <arg line="branch ${artifact.git.temporary_branch} ${artifact.git.remote_name}/${artifact.git.remote_branch}"/>
+        </exec>
+        <exec dir="${artifact.directory}" executable="git" checkreturn="true">
+            <arg line="checkout ${artifact.git.temporary_branch}"/>
+        </exec>
         <echo>Building on temporary branch '${artifact.git.temporary_branch}'.</echo>
     </target>
 
@@ -202,7 +240,9 @@
     <target name="artifact-updateCode" hidden="true">
         <!-- Sometimes files have read-only permissions that will cause issues when we
              attempt to remove them. -->
-        <exec dir="${artifact.directory}" command="chmod -R 750 ." checkreturn="true" logoutput="true" />
+        <exec dir="${artifact.directory}" executable="chmod" checkreturn="true" logoutput="true">
+            <arg line="-R 750 ."/>
+        </exec>
         <!-- Remove all the existing files so that we can install cleanly. -->
         <delete includeemptydirs="true">
             <fileset dir="${artifact.directory}" defaultexcludes="false" excludes=".git,.git/**" includes="**/*,**/.git,**/.git/**" />
@@ -211,7 +251,9 @@
         <!-- List all files that are checked in to git, then use the list to copy them all
              into the artifact. -->
         <tempfile property="tmpfile" destdir="${build.dir}/artifacts" />
-        <exec command="git ls-files" dir="${build.dir}" output="${tmpfile}" />
+        <exec executable="git" dir="${build.dir}" output="${tmpfile}">
+            <arg line="ls-files"/>
+        </exec>
 
         <copy todir="${artifact.directory}" overwrite="true" haltonerror="true">
             <filelist dir="${build.dir}" listfile="${tmpfile}" />
@@ -267,7 +309,9 @@
 
     <target name="artifact-commit" hidden="true">
         <!-- The 'allFiles' flag on the GitCommitTask does not add files that aren't already tracked by git. -->
-        <exec command="git add --all" dir="${artifact.directory}" />
+        <exec executable="git" dir="${artifact.directory}">
+            <arg line="add --all"/>
+        </exec>
 
         <!-- Commit all changes to the artifact repository. -->
         <gitcommit repository="${artifact.directory}" message="Drupal artifact build of ${artifact.git.commit_message}" allFiles="true" />
@@ -317,13 +361,17 @@
 
     <target name="artifact-push" hidden="true">
         <echo>Pushing changes.</echo>
-        <exec dir="${artifact.directory}" command="git push ${artifact.git.remote_name} ${artifact.git.temporary_branch}:${artifact.git.remote_branch}" checkreturn="true" />
+        <exec dir="${artifact.directory}" executable="git" checkreturn="true">
+            <arg line="push ${artifact.git.remote_name} ${artifact.git.temporary_branch}:${artifact.git.remote_branch}"/>
+        </exec>
 
         <!-- If this is a build of a tag, push the new artifact tag. -->
         <if>
             <equals arg1="${artifact.git.no_tag}" arg2="0" />
             <then>
-                <exec dir="${artifact.directory}" command="git push ${artifact.git.remote_name} ${artifact.git.artifact_tag}" checkreturn="true" />
+                <exec dir="${artifact.directory}" executable="git push ${artifact.git.remote_name} ${artifact.git.artifact_tag}" checkreturn="true">
+                    <arg line="push ${artifact.git.remote_name} ${artifact.git.artifact_tag}"/>
+                </exec>
             </then>
         </if>
     </target>
@@ -333,18 +381,30 @@
         <if>
             <equals arg1="${artifact.git.no_tag}" arg2="0" />
             <then>
-                <exec dir="${artifact.directory}" command="git tag -d ${artifact.git.artifact_tag}" checkreturn="true" logoutput="true" />
+                <exec dir="${artifact.directory}" executable="git" checkreturn="true" logoutput="true">
+                    <arg line="tag -d ${artifact.git.artifact_tag}"/>
+                </exec>
             </then>
         </if>
     </target>
 
 
     <target name="artifact-resetState" hidden="true">
-        <exec dir="${artifact.directory}" command="chmod -R 750 ." checkreturn="true" logoutput="true" />
-        <exec dir="${artifact.directory}" command="git reset --hard HEAD" checkreturn="true" logoutput="true" />
-        <exec dir="${artifact.directory}" command="git checkout ${artifact.git.remote_base_branch}" checkreturn="true" logoutput="true" />
-        <exec dir="${artifact.directory}" command="git clean -ffd" checkreturn="true" />
-        <exec dir="${artifact.directory}" command="git branch -D ${artifact.git.temporary_branch}" checkreturn="true" logoutput="true" />
+        <exec dir="${artifact.directory}" executable="chmod" checkreturn="true" logoutput="true">
+            <arg line="-R 750 ."/>
+        </exec>
+        <exec dir="${artifact.directory}" executable="git" checkreturn="true" logoutput="true">
+            <arg line="reset --hard HEAD"/>
+        </exec>
+        <exec dir="${artifact.directory}" executable="git" checkreturn="true" logoutput="true">
+            <arg line="checkout ${artifact.git.remote_base_branch}"/>
+        </exec>
+        <exec dir="${artifact.directory}" executable="git" checkreturn="true">
+            <arg line="clean -ffd"/>
+        </exec>
+        <exec dir="${artifact.directory}" executable="git" checkreturn="true" logoutput="true">
+            <arg line="branch -D ${artifact.git.temporary_branch}"/>
+        </exec>
     </target>
 
 
diff --git a/targets/drupal.xml b/targets/drupal.xml
index aef4d1b6..badde3cb 100644
--- a/targets/drupal.xml
+++ b/targets/drupal.xml
@@ -32,7 +32,9 @@
       <property name="drupal.validate_clean_config.dir" value="${build.dir}/${drupal.root}/${drupal.site.config_sync_directory}" />
 
         <!-- Use git to list local (not yet committed) changes to the config directory. -->
-        <exec command="git status --porcelain ${drupal.validate_clean_config.dir}" outputProperty="modified_files" />
+        <exec executable="git" outputProperty="modified_files">
+            <arg line="status --porcelain ${drupal.validate_clean_config.dir}"/>
+        </exec>
 
         <if>
             <and>
@@ -145,7 +147,10 @@ ${modified_files}
             <not><isset property="drupal.site.load_db.file" /></not>
             <then>
                 <!-- Use the last listed file that matches the drupal.site.load_db.export_pattern property -->
-                <exec dir="${build.dir}" command="ls ${drupal.site.load_db.export_pattern} | tail -1" outputProperty="drupal.site.load_db.discovered_file" />
+                <exec dir="${build.dir}" executable="bash" outputProperty="drupal.site.load_db.discovered_file">
+                    <arg value="-c"/>
+                    <arg line="ls ${drupal.site.load_db.export_pattern} | tail -1"/>
+                </exec>
                 <!-- ... but respect drupal.site.load_db.file if it was already set. -->
                 <property name="drupal.site.load_db.file" value="${drupal.site.load_db.discovered_file}" />
             </then>
@@ -178,7 +183,10 @@ Or, you can specify the export file directly:
         <!-- Load the contents of the file into Drupal -->
         <property name="drupal.site.load_db.command" value="${drupal.site.load_db.contents_command} ${drupal.site.load_db.file} | ${drupal.site.load_db.mysql_command}" />
         <echo>$> ${drupal.site.load_db.command}</echo>
-        <exec dir="${build.dir}" command="${drupal.site.load_db.command}" checkreturn="true" logoutput="true" />
+        <exec dir="${build.dir}" executable="bash" checkreturn="true" logoutput="true">
+            <arg value="-c"/>
+            <arg line="${drupal.site.load_db.command}"/>
+        </exec>
     </target>
 
 
@@ -191,7 +199,9 @@ Or, you can specify the export file directly:
 
         <!-- We have to format the test query differently when using "ddev drush" vs. when using "drush" directly. -->
         <property name="test_query" value="SELECT 1" />
-        <exec command="which ddev" returnProperty="which_ddev" />
+        <exec executable="which" returnProperty="which_ddev">
+            <arg line="ddev"/>
+        </exec>
         <if>
             <and>
                 <available file="${build.dir}/.ddev/config.yaml" />
@@ -396,7 +406,9 @@ $sites['${_multisite.sites_php_domain}'] = '${_multisite.dir}';
 
         <!-- If the '@multisite_placeholder@' is missing from the default properties file, the developer will have to
              add the configuration manually. -->
-        <exec command="grep '@multisite_placeholder@' .the-build/build.yml" returnProperty="_multisite.placeholder_missing" />
+        <exec executable="grep" returnProperty="_multisite.placeholder_missing">
+            <arg line="'@multisite_placeholder@' .the-build/build.yml"/>
+        </exec>
         <if>
             <equals arg1="${_multisite.placeholder_missing}" arg2="1" />
             <then>
diff --git a/targets/install.xml b/targets/install.xml
index 649e919d..32468cd3 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -158,8 +158,12 @@
                 </if>
 
                 <echo msg="Moving the ${drupal.root.old}/ directory to ${drupal.root}/" />
-                <exec command="rm -rf ${drupal.root}" dir="${build.dir}" />
-                <exec command="mv ${drupal.root.old} ${drupal.root}" dir="${build.dir}" checkreturn="true" logoutput="true" />
+                <exec executable="rm" dir="${build.dir}">
+                    <arg line="-rf ${drupal.root}"/>
+                </exec>
+                <exec executable="mv" dir="${build.dir}" checkreturn="true" logoutput="true">
+                    <arg line="${drupal.root.old} ${drupal.root}"/>
+                </exec>
 
                 <echo msg="Editing your composer.json to install Drupal in ${drupal.root}/" />
                 <reflexive>
@@ -173,7 +177,9 @@
                 </reflexive>
 
                 <echo msg="Updating your composer.lock hash" />
-                <exec command="composer update --lock" dir="${application.startdir}" />
+                <exec executable="composer" dir="${application.startdir}">
+                    <arg line="update --lock"/>
+                </exec>
 
             </then>
         </if>
diff --git a/targets/styleguide.xml b/targets/styleguide.xml
index 8f278c9f..8b456637 100644
--- a/targets/styleguide.xml
+++ b/targets/styleguide.xml
@@ -80,8 +80,10 @@
         Install and build the style guide.
         -->
     <target name="styleguide-build" depends="styleguide-exists-or-else,styleguide-install" hidden="true">
-        <echo>Running build command in ${styleguide.root}: ${styleguide.command}</echo>
-        <exec dir="${styleguide.root.resolved}" command="${styleguide.command}" passthru="true" checkreturn="true" />
+        <echo>Running build command in ${styleguide.root}: ${styleguide.command} ${styleguide.command_args}</echo>
+        <exec dir="${styleguide.root.resolved}" executable="${styleguide.command}" passthru="true" checkreturn="true">
+            <arg line="${styleguide.command_args}"/>
+        </exec>
     </target>
 
 
@@ -98,7 +100,9 @@
                 <not><available file="${styleguide.root.resolved}/vendor/autoload.php" type="file" /></not>
             </and>
             <then>
-                <exec dir="${styleguide.root.resolved}" command="composer install --no-interaction" passthru="true" checkreturn="true" />
+                <exec dir="${styleguide.root.resolved}" executable="composer" passthru="true" checkreturn="true">
+                    <arg line="install --no-interaction"/>
+                </exec>
             </then>
         </if>
 
@@ -112,7 +116,9 @@
                 </or>
             </and>
             <then>
-                <exec dir="${styleguide.root.resolved}" command="yarn install --non-interactive --no-progress --prefer-offline" passthru="true" checkreturn="true" />
+                <exec dir="${styleguide.root.resolved}" executable="yarn install --non-interactive --no-progress --prefer-offline" passthru="true" checkreturn="true">
+                    <arg line="install --non-interactive --no-progress --prefer-offline"/>
+                </exec>
             </then>
         </if>
     </target>
diff --git a/targets/the-build.xml b/targets/the-build.xml
index 0740cbcd..b86aebe8 100644
--- a/targets/the-build.xml
+++ b/targets/the-build.xml
@@ -92,7 +92,9 @@
     <property name="behat.bin" value="${build.dir}/vendor/bin/behat" />
 
     <!-- If this is a ddev project, and we're outside of ddev, run these commands within ddev.  -->
-    <exec command="which ddev" returnProperty="which_ddev" />
+    <exec executable="which" returnProperty="which_ddev">
+        <arg line="ddev"/>
+    </exec>
     <if>
         <and>
             <available file="${build.dir}/.ddev/config.yaml" />
@@ -106,8 +108,12 @@
     </if>
 
     <!-- Configure the composer command, depending on whether `composer` or `composer.phar` is available. -->
-    <exec command="command -v composer" outputProperty="composer.path.composer" />
-    <exec command="command -v composer.phar" outputProperty="composer.path.composer_phar" />
+    <exec executable="command" outputProperty="composer.path.composer">
+        <arg line="-v composer"/>
+    </exec>
+    <exec executable="command -v composer.phar" outputProperty="composer.path.composer_phar">
+        <arg line="-v composer.phar"/>
+    </exec>
     <if>
         <not><equals arg1="${composer.path.composer}" arg2="" /></not>
         <then><property name="composer.composer" value="${composer.path.composer}" /></then>