diff --git a/.ddev/commands/web/install b/.ddev/commands/web/install
index ed29afde5f..1407077e33 100755
--- a/.ddev/commands/web/install
+++ b/.ddev/commands/web/install
@@ -5,7 +5,7 @@
 ## Example: ddev install
 
 # Use the matching scaffolding branch if available.
-BRANCH_NAME=$(git -C /usr/local/quickstart-install-profile rev-parse --abbrev-ref HEAD); if [ $(git ls-remote --heads https://github.com/az-digital/az-quickstart-scaffolding.git $BRANCH_NAME | wc -l) = 1 ]; then SCAFFOLD_BRANCH="$BRANCH_NAME"; else SCAFFOLD_BRANCH="main"; fi; git clone --branch $SCAFFOLD_BRANCH https://github.com/az-digital/az-quickstart-scaffolding.git /var/www/html/azqs
+BRANCH_NAME=$(git -C /usr/local/quickstart-install-profile rev-parse --abbrev-ref HEAD); if [ $(git ls-remote --heads https://github.com/az-digital/az-quickstart-scaffolding.git $BRANCH_NAME | wc -l) = 1 ]; then SCAFFOLD_BRANCH="$BRANCH_NAME"; else SCAFFOLD_BRANCH="3.4.x"; fi; git clone --branch $SCAFFOLD_BRANCH https://github.com/az-digital/az-quickstart-scaffolding.git /var/www/html/azqs
 mv /var/www/html/azqs/* /var/www/html
 composer config repositories.localdev path /usr/local/quickstart-install-profile && composer require --no-update az-digital/az_quickstart:\*@dev
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0469160571..cc10fc1a9d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,9 +5,9 @@ on:
     branches:
       - 'main'
       - '2.x'
+      - '3.4.x'
       - '3.3.x'
       - '3.2.x'
-      - '3.1.x'
       - '2.14.x'
 
 concurrency:
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index a47070af6e..00b5081ad2 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -44,7 +44,7 @@ jobs:
           if [ $(git ls-remote --heads https://github.com/az-digital/az-quickstart-scaffolding.git $GITHUB_REF_NAME | wc -l) = 1 ]; then
             echo "SCAFFOLD_BRANCH=${GITHUB_REF_NAME}" >> ${GITHUB_ENV}
           else
-            echo "SCAFFOLD_BRANCH=main" >> ${GITHUB_ENV}
+            echo "SCAFFOLD_BRANCH=3.4.x" >> ${GITHUB_ENV}
           fi
       - name: Clone scaffolding repo
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
diff --git a/.github/workflows/security.yml b/.github/workflows/security.yml
index d88bf95af3..c3764a486a 100644
--- a/.github/workflows/security.yml
+++ b/.github/workflows/security.yml
@@ -25,7 +25,7 @@ jobs:
           if [ $(git ls-remote --heads https://github.com/az-digital/az-quickstart-scaffolding.git $AZ_TRIMMED_REF | wc -l) = 1 ]; then
             echo "SCAFFOLD_BRANCH=${AZ_TRIMMED_REF}" >> ${GITHUB_ENV}
           else
-            echo "SCAFFOLD_BRANCH=main" >> ${GITHUB_ENV}
+            echo "SCAFFOLD_BRANCH=3.4.x" >> ${GITHUB_ENV}
           fi
           if [ $(git ls-remote --heads https://github.com/az-digital/az-quickstart-dev.git $AZ_TRIMMED_REF | wc -l) = 1 ]; then
             echo "DEV_PACKAGE_BRANCH=${AZ_TRIMMED_REF}" >> ${GITHUB_ENV}
diff --git a/.probo.yaml b/.probo.yaml
index 860cdb5c75..9f946a75fb 100644
--- a/.probo.yaml
+++ b/.probo.yaml
@@ -9,7 +9,7 @@ steps:
     plugin: Script
     script:
       - composer self-update
-      - if [ $(git ls-remote --heads https://github.com/az-digital/az-quickstart-scaffolding.git $BRANCH_NAME | wc -l) = 1 ]; then SCAFFOLD_BRANCH="$BRANCH_NAME"; else SCAFFOLD_BRANCH=main; fi
+      - if [ $(git ls-remote --heads https://github.com/az-digital/az-quickstart-scaffolding.git $BRANCH_NAME | wc -l) = 1 ]; then SCAFFOLD_BRANCH="$BRANCH_NAME"; else SCAFFOLD_BRANCH=3.4.x; fi
       - if [ $(git ls-remote --heads https://github.com/az-digital/az-quickstart-dev.git $BRANCH_NAME | wc -l) = 1 ]; then DEV_PACKAGE_BRANCH="$BRANCH_NAME"; else DEV_PACKAGE_BRANCH=main; fi
       - git clone --branch $SCAFFOLD_BRANCH https://github.com/az-digital/az-quickstart-scaffolding.git
       - cd az-quickstart-scaffolding
diff --git a/.tugboat/config.yml b/.tugboat/config.yml
index aabe68a796..f0e5085540 100644
--- a/.tugboat/config.yml
+++ b/.tugboat/config.yml
@@ -32,7 +32,7 @@ services:
         if [ $(git ls-remote --heads $AZQS_SCAFFOLD_REPO $TUGBOAT_GITHUB_HEAD | wc -l) = 1 ]; then
           SCAFFOLD_BRANCH="$TUGBOAT_GITHUB_HEAD"
         else
-          SCAFFOLD_BRANCH="main"
+          SCAFFOLD_BRANCH="3.4.x"
         fi
         git clone --branch $SCAFFOLD_BRANCH $AZQS_SCAFFOLD_REPO $AZQS_COMPOSER_ROOT
 
diff --git a/composer.json b/composer.json
index 7617bd5681..6d8eb47524 100644
--- a/composer.json
+++ b/composer.json
@@ -153,10 +153,6 @@
         ]
     },
     "extra": {
-        "branch-alias": {
-            "dev-main": "3.4.x-dev",
-            "2.x-dev": "2.14.x-dev"
-        },
         "patches": {
             "drupal/auto_entitylabel": {
                 "Support entities without bundles (2945387)": "https://www.drupal.org/files/issues/2024-06-07/2945387-28.patch"