diff --git a/action.yaml b/action.yaml
index 59002e1..7ca7b8a 100644
--- a/action.yaml
+++ b/action.yaml
@@ -62,6 +62,15 @@ runs:
         INSTALL_TEMPEST=False
         GIT_BASE=https://github.com
         EOF
+
+        # Overriding target release for unmaintained versions
+        # otherwide devstack will fail to clone some repos.
+        TARGET_BRANCH=${{ inputs.branch }}
+        if [[ "${{ inputs.branch }}" == *"yoga"* ]]; then
+            TARGET_BRANCH="yoga-eom"
+        fi
+        echo "TARGET_BRANCH=${TARGET_BRANCH}" >> local.conf
+
         # horizon does not work in github action, permission error
         # dstat log takes too much memory to be stored by log artifacts
         # tempest must be disabled otherwise it will get installed still
@@ -70,17 +79,11 @@ runs:
           ENABLED_SERVICES+=",${{ inputs.enabled_services }}"
         fi
         echo "ENABLED_SERVICES+=${ENABLED_SERVICES}" >> local.conf
+
+        # This must stay at the end to allow any overrides
         if [[ "${{ inputs.conf_overrides }}" != "" ]]; then
           echo "${{ inputs.conf_overrides }}" >> local.conf
         fi
-
-        # Overriding target release for unmaintained versions
-        # otherwide devstack will fail to clone some repos.
-        TARGET_BRANCH=${{ inputs.branch }}
-        if [[ "${{ inputs.branch }}" == *"yoga"* ]]; then
-            TARGET_BRANCH="yoga-eom"
-        fi
-        echo "TARGET_BRANCH=${TARGET_BRANCH}" >> local.conf
       working-directory: ./devstack
       shell: bash
     - name: Run devstack