diff --git a/Steps/PrGate.yml b/Steps/PrGate.yml
index 025d7994..dfc5ad34 100644
--- a/Steps/PrGate.yml
+++ b/Steps/PrGate.yml
@@ -123,12 +123,6 @@ steps:
 - ${{ if eq(parameters.install_tools, true) }}:
   - template: InstallCoverageTools.yml
 
-# Potential Extra steps
-- ${{ if eq(parameters.self_host_agent, false) }}:
-  - ${{ parameters.extra_install_step }}
-- ${{ else }}:
-  - bash: echo "##[warning]A self-hosted agent build requested extra install steps. Those are not supported right now."
-
 # Build repo
 - ${{ if eq(parameters.do_ci_setup, true) }}:
   - task: CmdLine@2
@@ -150,6 +144,12 @@ steps:
     script: stuart_update -c ${{ parameters.build_file }} -p $(pkgs_to_build) -t ${{ parameters.build_targets}} -a ${{ parameters.build_archs}} TOOL_CHAIN_TAG=${{ parameters.tool_chain_tag}}
   condition: and(gt(variables.pkg_count, 0), succeeded())
 
+# Potential Extra steps
+- ${{ if eq(parameters.self_host_agent, false) }}:
+  - ${{ parameters.extra_install_step }}
+- ${{ else }}:
+  - bash: echo "##[warning]A self-hosted agent build requested extra install steps. Those are not supported right now."
+
 - ${{ if eq(parameters.do_non_ci_build, true) }}:
   - task: CmdLine@2
     displayName: Build and Test ${{ parameters.build_pkgs }} ${{ parameters.build_archs}}