diff --git a/src/Robo/Commands/Saml/SimpleSamlPhpCommand.php b/src/Robo/Commands/Saml/SimpleSamlPhpCommand.php
index 1ebc224ed..f048386a3 100644
--- a/src/Robo/Commands/Saml/SimpleSamlPhpCommand.php
+++ b/src/Robo/Commands/Saml/SimpleSamlPhpCommand.php
@@ -193,6 +193,17 @@ public function simpleSamlPhpBuildConfig() {
     }
   }
 
+  /**
+   * Ensures SimpleSamlPhp enabled repos have config copied on composer runs.
+   *
+   * @hook post-command source:build:composer
+   */
+  public function postComposerHook() {
+    if ($this->getConfig()->has('simplesamlphp') && $this->getConfigValue('simplesamlphp')) {
+      $this->invokeCommand('source:build:simplesamlphp-config');
+    }
+  }
+
   /**
    * Outputs a message to edit the new config files.
    */
diff --git a/src/Robo/Commands/Setup/BuildCommand.php b/src/Robo/Commands/Setup/BuildCommand.php
index cec6dd14f..bee72cac3 100644
--- a/src/Robo/Commands/Setup/BuildCommand.php
+++ b/src/Robo/Commands/Setup/BuildCommand.php
@@ -90,10 +90,6 @@ public function build() {
       'source:build:frontend',
     ]);
 
-    if ($this->getConfig()->has('simplesamlphp') && $this->getConfigValue('simplesamlphp')) {
-      $this->invokeCommand('source:build:simplesamlphp-config');
-    }
-
     $this->invokeHook("post-setup-build");
   }