From 878007f031d6a08614915d7cf3e881a9918e7ee0 Mon Sep 17 00:00:00 2001
From: David Mallon <david.mallon@perforce.com>
Date: Thu, 18 Sep 2025 10:42:32 +0100
Subject: [PATCH 1/5] (MAINT) min change

---
 plans/backup.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plans/backup.pp b/plans/backup.pp
index 5d78a7ea9..0595da3f1 100644
--- a/plans/backup.pp
+++ b/plans/backup.pp
@@ -8,7 +8,7 @@
 #   bolt plan run peadm::backup -t primary1.example.com
 #
 plan peadm::backup (
-  # This plan should be run on the primary server
+  # This plan should be run on the primary serverggggggg
   Peadm::SingleTargetSpec     $targets,
 
   # backup type determines the backup options

From e5d37cdf4787f8ac4c5bde69af6dafce71837781 Mon Sep 17 00:00:00 2001
From: David Mallon <david.mallon@perforce.com>
Date: Mon, 22 Sep 2025 14:15:36 +0100
Subject: [PATCH 2/5] (MAINT) try different os to install on

---
 .github/workflows/test-add-compiler-matrix.yml |  2 +-
 .github/workflows/test-add-replica-matrix.yaml |  2 +-
 .github/workflows/test-migration.yaml          | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-add-compiler-matrix.yml b/.github/workflows/test-add-compiler-matrix.yml
index 3caf6071a..617264aeb 100644
--- a/.github/workflows/test-add-compiler-matrix.yml
+++ b/.github/workflows/test-add-compiler-matrix.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         architecture: [standard, large, extra-large]
         version: [2021.7.9, 2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-8]
+        image: [almalinux-cloud/almalinux-9]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
diff --git a/.github/workflows/test-add-replica-matrix.yaml b/.github/workflows/test-add-replica-matrix.yaml
index c01b89991..7d6bcf2e9 100644
--- a/.github/workflows/test-add-replica-matrix.yaml
+++ b/.github/workflows/test-add-replica-matrix.yaml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         architecture: [standard, standard-with-dr, large, extra-large]
         version: [2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-8]
+        image: [almalinux-cloud/almalinux-9]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
diff --git a/.github/workflows/test-migration.yaml b/.github/workflows/test-migration.yaml
index 69cadf655..65c8f2be5 100644
--- a/.github/workflows/test-migration.yaml
+++ b/.github/workflows/test-migration.yaml
@@ -44,19 +44,19 @@ jobs:
           - large-with-dr
           - extra-large-with-dr
         version: [2021.7.9, 2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-8]
+        image: [almalinux-cloud/almalinux-9]
         include:
           - architecture: standard
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-8
+            image: almalinux-cloud/almalinux-9
             new_pe_version: 2025.5.0
           - architecture: large
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-8
+            image: almalinux-cloud/almalinux-9
             new_pe_version: 2025.5.0
           - architecture: extra-large
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-8
+            image: almalinux-cloud/almalinux-9
             new_pe_version: 2025.5.0
          # excluding the following combinations as due to their long running nature they always fail due to 
          # the test nodes in GCP that litmus provisions becoming unreachable after a time. If we address PE-40902
@@ -64,10 +64,10 @@ jobs:
         exclude:
           - architecture: extra-large-with-dr
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-8
+            image: almalinux-cloud/almalinux-9
           - architecture: extra-large-with-dr
             version: 2025.5.0
-            image: almalinux-cloud/almalinux-8
+            image: almalinux-cloud/almalinux-9
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4

From 1acd8ef457823a4fc1351f7e32dce0906af4879a Mon Sep 17 00:00:00 2001
From: David Mallon <david.mallon@perforce.com>
Date: Mon, 22 Sep 2025 16:29:51 +0100
Subject: [PATCH 3/5] (MAINT) revert  different os

---
 .github/workflows/test-add-compiler-matrix.yml |  2 +-
 .github/workflows/test-add-replica-matrix.yaml |  2 +-
 .github/workflows/test-migration.yaml          | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-add-compiler-matrix.yml b/.github/workflows/test-add-compiler-matrix.yml
index 617264aeb..3caf6071a 100644
--- a/.github/workflows/test-add-compiler-matrix.yml
+++ b/.github/workflows/test-add-compiler-matrix.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         architecture: [standard, large, extra-large]
         version: [2021.7.9, 2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-9]
+        image: [almalinux-cloud/almalinux-8]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
diff --git a/.github/workflows/test-add-replica-matrix.yaml b/.github/workflows/test-add-replica-matrix.yaml
index 7d6bcf2e9..c01b89991 100644
--- a/.github/workflows/test-add-replica-matrix.yaml
+++ b/.github/workflows/test-add-replica-matrix.yaml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         architecture: [standard, standard-with-dr, large, extra-large]
         version: [2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-9]
+        image: [almalinux-cloud/almalinux-8]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
diff --git a/.github/workflows/test-migration.yaml b/.github/workflows/test-migration.yaml
index 65c8f2be5..69cadf655 100644
--- a/.github/workflows/test-migration.yaml
+++ b/.github/workflows/test-migration.yaml
@@ -44,19 +44,19 @@ jobs:
           - large-with-dr
           - extra-large-with-dr
         version: [2021.7.9, 2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-9]
+        image: [almalinux-cloud/almalinux-8]
         include:
           - architecture: standard
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-9
+            image: almalinux-cloud/almalinux-8
             new_pe_version: 2025.5.0
           - architecture: large
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-9
+            image: almalinux-cloud/almalinux-8
             new_pe_version: 2025.5.0
           - architecture: extra-large
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-9
+            image: almalinux-cloud/almalinux-8
             new_pe_version: 2025.5.0
          # excluding the following combinations as due to their long running nature they always fail due to 
          # the test nodes in GCP that litmus provisions becoming unreachable after a time. If we address PE-40902
@@ -64,10 +64,10 @@ jobs:
         exclude:
           - architecture: extra-large-with-dr
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-9
+            image: almalinux-cloud/almalinux-8
           - architecture: extra-large-with-dr
             version: 2025.5.0
-            image: almalinux-cloud/almalinux-9
+            image: almalinux-cloud/almalinux-8
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4

From d6f69359f0c0b1bc3faff068be97f5ede14da355 Mon Sep 17 00:00:00 2001
From: David Mallon <david.mallon@perforce.com>
Date: Tue, 23 Sep 2025 10:42:30 +0100
Subject: [PATCH 4/5] (MAINT) try 9 again

---
 .../workflows/test-add-compiler-matrix.yml    |  2 +-
 .github/workflows/test-add-compiler.yaml      |  2 +-
 .../workflows/test-add-replica-matrix.yaml    |  4 +--
 .github/workflows/test-add-replica.yaml       | 12 ++++-----
 .../test-backup-restore-migration.yaml        | 23 +++++++++--------
 .github/workflows/test-backup-restore.yaml    | 13 +++++-----
 .github/workflows/test-failover.yaml          | 10 ++++----
 .../workflows/test-install-latest-dev.yaml    | 10 ++++----
 ...est-install-latest-xlarge-dev-nightly.yaml |  6 ++---
 .github/workflows/test-install-matrix.yaml    |  4 +--
 .github/workflows/test-install.yaml           | 12 ++++-----
 .github/workflows/test-legacy-compilers.yaml  |  6 ++---
 .github/workflows/test-legacy-upgrade.yaml    |  6 ++---
 .github/workflows/test-migration.yaml         | 25 ++++++++++---------
 .../test-replace-failed-postgresql.yaml       |  6 ++---
 .../workflows/test-upgrade-latest-dev.yaml    | 15 +++++------
 ...est-upgrade-latest-xlarge-dev-nightly.yaml |  7 +++---
 .github/workflows/test-upgrade-matrix.yaml    |  9 ++++---
 .github/workflows/test-upgrade.yaml           | 14 +++++------
 19 files changed, 97 insertions(+), 89 deletions(-)

diff --git a/.github/workflows/test-add-compiler-matrix.yml b/.github/workflows/test-add-compiler-matrix.yml
index 3caf6071a..617264aeb 100644
--- a/.github/workflows/test-add-compiler-matrix.yml
+++ b/.github/workflows/test-add-compiler-matrix.yml
@@ -37,7 +37,7 @@ jobs:
       matrix:
         architecture: [standard, large, extra-large]
         version: [2021.7.9, 2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-8]
+        image: [almalinux-cloud/almalinux-9]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
diff --git a/.github/workflows/test-add-compiler.yaml b/.github/workflows/test-add-compiler.yaml
index 629ac3156..02d81049a 100644
--- a/.github/workflows/test-add-compiler.yaml
+++ b/.github/workflows/test-add-compiler.yaml
@@ -6,7 +6,7 @@ on:
       image:
         description: GCP image for test cluster
         required: true
-        default: almalinux-cloud/almalinux-8
+        default: almalinux-cloud/almalinux-9
       architecture:
         description: PE architecture to test
         required: true
diff --git a/.github/workflows/test-add-replica-matrix.yaml b/.github/workflows/test-add-replica-matrix.yaml
index c01b89991..ae621ea2f 100644
--- a/.github/workflows/test-add-replica-matrix.yaml
+++ b/.github/workflows/test-add-replica-matrix.yaml
@@ -37,14 +37,14 @@ jobs:
       matrix:
         architecture: [standard, standard-with-dr, large, extra-large]
         version: [2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-8]
+        image: [almalinux-cloud/almalinux-9]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-add-replica.yaml b/.github/workflows/test-add-replica.yaml
index 5fc5746d6..f799cffef 100644
--- a/.github/workflows/test-add-replica.yaml
+++ b/.github/workflows/test-add-replica.yaml
@@ -6,7 +6,7 @@ on:
       image:
         description: GCP image for test cluster
         required: true
-        default: almalinux-cloud/almalinux-8
+        default: almalinux-cloud/almalinux-9
       architecture:
         description: PE architecture to test
         required: true
@@ -18,7 +18,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: 'false'
+        default: "false"
 jobs:
   test-add-replica:
     name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
@@ -30,9 +30,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        architecture: ['${{ github.event.inputs.architecture }}']
-        version: ['${{ github.event.inputs.version }}']
-        image: ['${{ github.event.inputs.image }}']
+        architecture: ["${{ github.event.inputs.architecture }}"]
+        version: ["${{ github.event.inputs.version }}"]
+        image: ["${{ github.event.inputs.image }}"]
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -45,7 +45,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-backup-restore-migration.yaml b/.github/workflows/test-backup-restore-migration.yaml
index e0c774977..9b2de5f38 100644
--- a/.github/workflows/test-backup-restore-migration.yaml
+++ b/.github/workflows/test-backup-restore-migration.yaml
@@ -6,7 +6,7 @@ on:
       image:
         description: GCP image for test cluster
         required: true
-        default: almalinux-cloud/almalinux-8
+        default: almalinux-cloud/almalinux-9
       architecture:
         description: PE architecture to test
         required: true
@@ -18,11 +18,12 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: 'false'
+        default: "false"
 jobs:
   backup:
-    name: 'Backup: Cluster A: PE ${{ inputs.version }} ${{ inputs.architecture }}
-      on ${{ inputs.image }}'
+    name:
+      "Backup: Cluster A: PE ${{ inputs.version }} ${{ inputs.architecture }}
+      on ${{ inputs.image }}"
     runs-on: ubuntu-latest
     env:
       BOLT_GEM: true
@@ -40,7 +41,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -136,8 +137,9 @@ jobs:
             echo ::endgroup::
           fi
   restore:
-    name: 'Restore: Cluster B: PE ${{ inputs.version }} ${{ inputs.architecture }}
-      on ${{ inputs.image }}'
+    name:
+      "Restore: Cluster B: PE ${{ inputs.version }} ${{ inputs.architecture }}
+      on ${{ inputs.image }}"
     runs-on: ubuntu-latest
     env:
       BOLT_GEM: true
@@ -149,7 +151,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -199,8 +201,9 @@ jobs:
         uses: lewagon/wait-on-check-action@v1.3.4
         with:
           ref: ${{ github.ref }}
-          check-name: 'Backup: Cluster A: PE ${{ inputs.version }} ${{ inputs.architecture }}
-            on ${{ inputs.image }}'
+          check-name:
+            "Backup: Cluster A: PE ${{ inputs.version }} ${{ inputs.architecture }}
+            on ${{ inputs.image }}"
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           wait-interval: 10
       - name: Tear down cluster B
diff --git a/.github/workflows/test-backup-restore.yaml b/.github/workflows/test-backup-restore.yaml
index ee4117d6b..d5b879b92 100644
--- a/.github/workflows/test-backup-restore.yaml
+++ b/.github/workflows/test-backup-restore.yaml
@@ -8,7 +8,7 @@ on:
       image:
         description: GCP image for test cluster
         required: true
-        default: almalinux-cloud/almalinux-8
+        default: almalinux-cloud/almalinux-9
       architecture:
         description: PE architecture to test
         required: true
@@ -28,11 +28,12 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: 'false'
+        default: "false"
 jobs:
   backup-restore-test:
-    name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.5.0' }}\
-      \ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }}"
+    name:
+      "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.5.0' }}\
+      \ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-9' }}"
     runs-on: ubuntu-latest
     env:
       BOLT_GEM: true
@@ -50,7 +51,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -72,7 +73,7 @@ jobs:
               bundle exec bolt plan run peadm_spec::provision_test_cluster \
                 --modulepath spec/fixtures/modules \
                 provider=provision_service \
-                image=${{ github.event.inputs.image || 'almalinux-cloud/almalinux-8' }} \
+                image=${{ github.event.inputs.image || 'almalinux-cloud/almalinux-9' }} \
                 architecture=${{ github.event.inputs.architecture || 'extra-large' }}
           echo ::endgroup::
           echo ::group::info:request
diff --git a/.github/workflows/test-failover.yaml b/.github/workflows/test-failover.yaml
index 52412f7b6..cf0e1137a 100644
--- a/.github/workflows/test-failover.yaml
+++ b/.github/workflows/test-failover.yaml
@@ -6,7 +6,7 @@ on:
       image:
         description: GCP image for test cluster
         required: true
-        default: almalinux-cloud/almalinux-8
+        default: almalinux-cloud/almalinux-9
       version:
         description: PE version to install
         required: true
@@ -18,7 +18,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: 'false'
+        default: "false"
       log_level:
         description: Bolt log level
         required: false
@@ -34,8 +34,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ['${{ github.event.inputs.version }}']
-        image: ['${{ github.event.inputs.image }}']
+        version: ["${{ github.event.inputs.version }}"]
+        image: ["${{ github.event.inputs.image }}"]
         architecture: [extra-large-with-dr]
     steps:
       - name: Start SSH session
@@ -49,7 +49,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-install-latest-dev.yaml b/.github/workflows/test-install-latest-dev.yaml
index 994356196..aca9ab2b7 100644
--- a/.github/workflows/test-install-latest-dev.yaml
+++ b/.github/workflows/test-install-latest-dev.yaml
@@ -6,7 +6,7 @@ on:
       image:
         description: GCP image for test cluster
         required: true
-        default: almalinux-cloud/almalinux-8
+        default: almalinux-cloud/almalinux-9
       architecture:
         type: choice
         required: true
@@ -22,7 +22,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: 'false'
+        default: "false"
 jobs:
   test-install:
     name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
@@ -34,8 +34,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        architecture: ['${{ github.event.inputs.architecture }}']
-        image: ['${{ github.event.inputs.image }}']
+        architecture: ["${{ github.event.inputs.architecture }}"]
+        image: ["${{ github.event.inputs.image }}"]
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -48,7 +48,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml b/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml
index 180e67d3a..93cf96a25 100644
--- a/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml
+++ b/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml
@@ -8,7 +8,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: 'false'
+        default: "false"
 jobs:
   test-install:
     name: PE nightly using ${{ matrix.architecture }} on ${{ matrix.image }}
@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         architecture: [extra-large-with-dr]
-        image: [almalinux-cloud/almalinux-8]
+        image: [almalinux-cloud/almalinux-9]
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -34,7 +34,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml
index c4afb2556..f21482763 100644
--- a/.github/workflows/test-install-matrix.yaml
+++ b/.github/workflows/test-install-matrix.yaml
@@ -37,14 +37,14 @@ jobs:
       matrix:
         architecture: [standard-with-dr, large, extra-large-with-dr]
         version: [2021.7.9, 2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-8]
+        image: [almalinux-cloud/almalinux-9]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml
index 0ab2f7acb..ca1eb0924 100644
--- a/.github/workflows/test-install.yaml
+++ b/.github/workflows/test-install.yaml
@@ -6,7 +6,7 @@ on:
       image:
         description: GCP image for test cluster
         required: true
-        default: almalinux-cloud/almalinux-8
+        default: almalinux-cloud/almalinux-9
       architecture:
         description: PE architecture to test
         required: true
@@ -18,7 +18,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: 'false'
+        default: "false"
 jobs:
   test-install:
     name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
@@ -30,9 +30,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        architecture: ['${{ github.event.inputs.architecture }}']
-        version: ['${{ github.event.inputs.version }}']
-        image: ['${{ github.event.inputs.image }}']
+        architecture: ["${{ github.event.inputs.architecture }}"]
+        version: ["${{ github.event.inputs.version }}"]
+        image: ["${{ github.event.inputs.image }}"]
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -45,7 +45,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-legacy-compilers.yaml b/.github/workflows/test-legacy-compilers.yaml
index 07f6c017a..ab7c39baa 100644
--- a/.github/workflows/test-legacy-compilers.yaml
+++ b/.github/workflows/test-legacy-compilers.yaml
@@ -28,7 +28,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: 'false'
+        default: "false"
 jobs:
   convert_compiler:
     name: Convert compilers to legacy
@@ -49,7 +49,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -71,7 +71,7 @@ jobs:
             bundle exec bolt plan run peadm_spec::provision_test_cluster \
               --modulepath spec/fixtures/modules \
               provider=provision_service \
-              image=almalinux-cloud/almalinux-8 \
+              image=almalinux-cloud/almalinux-9 \
               architecture=large-with-dr
           echo ::endgroup::
           echo ::group::certnames
diff --git a/.github/workflows/test-legacy-upgrade.yaml b/.github/workflows/test-legacy-upgrade.yaml
index 4ed832d0d..284a57631 100644
--- a/.github/workflows/test-legacy-upgrade.yaml
+++ b/.github/workflows/test-legacy-upgrade.yaml
@@ -28,7 +28,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: 'false'
+        default: "false"
 jobs:
   upgrade_with_legacy_compilers:
     name: Upgrade PE with legacy compilers
@@ -49,7 +49,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -71,7 +71,7 @@ jobs:
             bundle exec bolt plan run peadm_spec::provision_test_cluster \
               --modulepath spec/fixtures/modules \
               provider=provision_service \
-              image=almalinux-cloud/almalinux-8 \
+              image=almalinux-cloud/almalinux-9 \
               architecture=large-with-dr
           echo ::endgroup::
           echo ::group::certnames
diff --git a/.github/workflows/test-migration.yaml b/.github/workflows/test-migration.yaml
index 69cadf655..ffcea00b5 100644
--- a/.github/workflows/test-migration.yaml
+++ b/.github/workflows/test-migration.yaml
@@ -26,7 +26,8 @@ on:
   workflow_dispatch: {}
 jobs:
   test-migration:
-    name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
+    name:
+      PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
       PE upgrade? ${{ matrix.new_pe_version }}
     runs-on: ubuntu-latest
     env:
@@ -44,30 +45,30 @@ jobs:
           - large-with-dr
           - extra-large-with-dr
         version: [2021.7.9, 2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-8]
+        image: [almalinux-cloud/almalinux-9]
         include:
           - architecture: standard
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-8
+            image: almalinux-cloud/almalinux-9
             new_pe_version: 2025.5.0
           - architecture: large
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-8
+            image: almalinux-cloud/almalinux-9
             new_pe_version: 2025.5.0
           - architecture: extra-large
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-8
+            image: almalinux-cloud/almalinux-9
             new_pe_version: 2025.5.0
-         # excluding the following combinations as due to their long running nature they always fail due to 
-         # the test nodes in GCP that litmus provisions becoming unreachable after a time. If we address PE-40902
-         # to change how we provision test nodes in CI then we will hopefully be able to include these
+          # excluding the following combinations as due to their long running nature they always fail due to
+          # the test nodes in GCP that litmus provisions becoming unreachable after a time. If we address PE-40902
+          # to change how we provision test nodes in CI then we will hopefully be able to include these
         exclude:
           - architecture: extra-large-with-dr
             version: 2023.8.5
-            image: almalinux-cloud/almalinux-8
+            image: almalinux-cloud/almalinux-9
           - architecture: extra-large-with-dr
             version: 2025.5.0
-            image: almalinux-cloud/almalinux-8
+            image: almalinux-cloud/almalinux-9
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
@@ -76,7 +77,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -114,7 +115,7 @@ jobs:
             --modulepath spec/fixtures/modules \
             --no-host-key-check \
             inventory_file=spec/fixtures/litmus_inventory.yaml
-          echo ::endgroup::            
+          echo ::endgroup::
       - name: Output contents of litmus_inventory.yaml
         run: |
           cat spec/fixtures/litmus_inventory.yaml
diff --git a/.github/workflows/test-replace-failed-postgresql.yaml b/.github/workflows/test-replace-failed-postgresql.yaml
index bb677db51..9df6adc43 100644
--- a/.github/workflows/test-replace-failed-postgresql.yaml
+++ b/.github/workflows/test-replace-failed-postgresql.yaml
@@ -38,7 +38,7 @@ jobs:
         architecture: [extra-large-with-dr-and-spare-replica]
         install_architecture: [extra-large-with-dr]
         version: [2021.7.9, 2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-8]
+        image: [almalinux-cloud/almalinux-9]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
@@ -47,7 +47,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -85,7 +85,7 @@ jobs:
             --modulepath spec/fixtures/modules \
             --no-host-key-check \
             inventory_file=spec/fixtures/litmus_inventory.yaml
-          echo ::endgroup::            
+          echo ::endgroup::
       - name: Output contents of litmus_inventory.yaml
         run: |
           cat spec/fixtures/litmus_inventory.yaml
diff --git a/.github/workflows/test-upgrade-latest-dev.yaml b/.github/workflows/test-upgrade-latest-dev.yaml
index 254ba4c57..4c652bc16 100644
--- a/.github/workflows/test-upgrade-latest-dev.yaml
+++ b/.github/workflows/test-upgrade-latest-dev.yaml
@@ -6,7 +6,7 @@ on:
       image:
         description: GCP image for test cluster
         required: true
-        default: almalinux-cloud/almalinux-8
+        default: almalinux-cloud/almalinux-9
       architecture:
         type: choice
         required: true
@@ -27,10 +27,11 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: 'false'
+        default: "false"
 jobs:
   test-upgrade:
-    name: PE ${{ matrix.version }} to latest dev using ${{ matrix.architecture }}
+    name:
+      PE ${{ matrix.version }} to latest dev using ${{ matrix.architecture }}
       on ${{ matrix.image }}
     runs-on: ubuntu-latest
     env:
@@ -40,9 +41,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        architecture: ['${{ github.event.inputs.architecture }}']
-        version: ['${{ github.event.inputs.version }}']
-        image: ['${{ github.event.inputs.image }}']
+        architecture: ["${{ github.event.inputs.architecture }}"]
+        version: ["${{ github.event.inputs.version }}"]
+        image: ["${{ github.event.inputs.image }}"]
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -55,7 +56,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml
index 280f2a198..391ece4da 100644
--- a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml
+++ b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml
@@ -5,7 +5,8 @@ on:
     - cron: 0 3 * * *
 jobs:
   test-upgrade:
-    name: PE ${{ matrix.version }} to nightly dev using ${{ matrix.architecture }}
+    name:
+      PE ${{ matrix.version }} to nightly dev using ${{ matrix.architecture }}
       on ${{ matrix.image }}
     runs-on: ubuntu-latest
     env:
@@ -17,14 +18,14 @@ jobs:
       matrix:
         architecture: [extra-large-with-dr]
         version: [2023.8.5]
-        image: [almalinux-cloud/almalinux-8]
+        image: [almalinux-cloud/almalinux-9]
     steps:
       - name: Checkout Source
         uses: actions/checkout@v4
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml
index 27d7644a7..2efec6f37 100644
--- a/.github/workflows/test-upgrade-matrix.yaml
+++ b/.github/workflows/test-upgrade-matrix.yaml
@@ -26,7 +26,8 @@ on:
   workflow_dispatch: {}
 jobs:
   test-upgrade:
-    name: PE ${{ matrix.version }} to ${{ matrix.version_to_upgrade }} ${{ matrix.architecture }}
+    name:
+      PE ${{ matrix.version }} to ${{ matrix.version_to_upgrade }} ${{ matrix.architecture }}
       on ${{ matrix.image }}
     runs-on: ubuntu-latest
     env:
@@ -36,10 +37,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        architecture: [standard, extra-large]  # removing xl-with dr until PE-40902 is addressed
+        architecture: [standard, extra-large] # removing xl-with dr until PE-40902 is addressed
         version: [2021.7.9, 2023.8.5]
         version_to_upgrade: [2021.7.9, 2023.8.5, 2025.5.0]
-        image: [almalinux-cloud/almalinux-8]
+        image: [almalinux-cloud/almalinux-9]
         download_mode: [direct]
         exclude:
           - version: 2021.7.9
@@ -62,7 +63,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-upgrade.yaml b/.github/workflows/test-upgrade.yaml
index 9f0b47b27..42103679c 100644
--- a/.github/workflows/test-upgrade.yaml
+++ b/.github/workflows/test-upgrade.yaml
@@ -6,7 +6,7 @@ on:
       image:
         description: GCP image for test cluster
         required: true
-        default: almalinux-cloud/almalinux-8
+        default: almalinux-cloud/almalinux-9
       architecture:
         type: choice
         required: true
@@ -30,7 +30,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: 'false'
+        default: "false"
 jobs:
   test-upgrade:
     name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
@@ -43,10 +43,10 @@ jobs:
       fail-fast: false
       matrix:
         download_mode: [direct]
-        architecture: ['${{ github.event.inputs.architecture }}']
-        version: ['${{ github.event.inputs.version }}']
-        version_to_upgrade: ['${{ github.event.inputs.upgrade_version }}']
-        image: ['${{ github.event.inputs.image }}']
+        architecture: ["${{ github.event.inputs.architecture }}"]
+        version: ["${{ github.event.inputs.version }}"]
+        version_to_upgrade: ["${{ github.event.inputs.upgrade_version }}"]
+        image: ["${{ github.event.inputs.image }}"]
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -59,7 +59,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.1'
+          ruby-version: "3.1"
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}

From a7d299adb44122191c6b108b6bb50e933c7be014 Mon Sep 17 00:00:00 2001
From: David Mallon <david.mallon@perforce.com>
Date: Tue, 23 Sep 2025 10:46:57 +0100
Subject: [PATCH 5/5] (MAINT) yaml fixes

---
 .../workflows/test-add-replica-matrix.yaml    |  2 +-
 .github/workflows/test-add-replica.yaml       | 10 ++++-----
 .../test-backup-restore-migration.yaml        | 21 ++++++++-----------
 .github/workflows/test-backup-restore.yaml    |  7 +++----
 .github/workflows/test-failover.yaml          |  8 +++----
 .../workflows/test-install-latest-dev.yaml    |  8 +++----
 ...est-install-latest-xlarge-dev-nightly.yaml |  4 ++--
 .github/workflows/test-install-matrix.yaml    |  2 +-
 .github/workflows/test-install.yaml           | 10 ++++-----
 .github/workflows/test-legacy-compilers.yaml  |  4 ++--
 .github/workflows/test-legacy-upgrade.yaml    |  4 ++--
 .github/workflows/test-migration.yaml         |  5 ++---
 .../test-replace-failed-postgresql.yaml       |  2 +-
 .../workflows/test-upgrade-latest-dev.yaml    | 13 ++++++------
 ...est-upgrade-latest-xlarge-dev-nightly.yaml |  5 ++---
 .github/workflows/test-upgrade-matrix.yaml    |  7 +++----
 .github/workflows/test-upgrade.yaml           | 12 +++++------
 17 files changed, 58 insertions(+), 66 deletions(-)

diff --git a/.github/workflows/test-add-replica-matrix.yaml b/.github/workflows/test-add-replica-matrix.yaml
index ae621ea2f..7d6bcf2e9 100644
--- a/.github/workflows/test-add-replica-matrix.yaml
+++ b/.github/workflows/test-add-replica-matrix.yaml
@@ -44,7 +44,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-add-replica.yaml b/.github/workflows/test-add-replica.yaml
index f799cffef..3af0af20a 100644
--- a/.github/workflows/test-add-replica.yaml
+++ b/.github/workflows/test-add-replica.yaml
@@ -18,7 +18,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: "false"
+        default: 'false'
 jobs:
   test-add-replica:
     name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
@@ -30,9 +30,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        architecture: ["${{ github.event.inputs.architecture }}"]
-        version: ["${{ github.event.inputs.version }}"]
-        image: ["${{ github.event.inputs.image }}"]
+        architecture: ['${{ github.event.inputs.architecture }}']
+        version: ['${{ github.event.inputs.version }}']
+        image: ['${{ github.event.inputs.image }}']
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -45,7 +45,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-backup-restore-migration.yaml b/.github/workflows/test-backup-restore-migration.yaml
index 9b2de5f38..bc5d24808 100644
--- a/.github/workflows/test-backup-restore-migration.yaml
+++ b/.github/workflows/test-backup-restore-migration.yaml
@@ -18,12 +18,11 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: "false"
+        default: 'false'
 jobs:
   backup:
-    name:
-      "Backup: Cluster A: PE ${{ inputs.version }} ${{ inputs.architecture }}
-      on ${{ inputs.image }}"
+    name: 'Backup: Cluster A: PE ${{ inputs.version }} ${{ inputs.architecture }}
+      on ${{ inputs.image }}'
     runs-on: ubuntu-latest
     env:
       BOLT_GEM: true
@@ -41,7 +40,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -137,9 +136,8 @@ jobs:
             echo ::endgroup::
           fi
   restore:
-    name:
-      "Restore: Cluster B: PE ${{ inputs.version }} ${{ inputs.architecture }}
-      on ${{ inputs.image }}"
+    name: 'Restore: Cluster B: PE ${{ inputs.version }} ${{ inputs.architecture }}
+      on ${{ inputs.image }}'
     runs-on: ubuntu-latest
     env:
       BOLT_GEM: true
@@ -151,7 +149,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
@@ -201,9 +199,8 @@ jobs:
         uses: lewagon/wait-on-check-action@v1.3.4
         with:
           ref: ${{ github.ref }}
-          check-name:
-            "Backup: Cluster A: PE ${{ inputs.version }} ${{ inputs.architecture }}
-            on ${{ inputs.image }}"
+          check-name: 'Backup: Cluster A: PE ${{ inputs.version }} ${{ inputs.architecture }}
+            on ${{ inputs.image }}'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           wait-interval: 10
       - name: Tear down cluster B
diff --git a/.github/workflows/test-backup-restore.yaml b/.github/workflows/test-backup-restore.yaml
index d5b879b92..5f2ac1794 100644
--- a/.github/workflows/test-backup-restore.yaml
+++ b/.github/workflows/test-backup-restore.yaml
@@ -28,11 +28,10 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: "false"
+        default: 'false'
 jobs:
   backup-restore-test:
-    name:
-      "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.5.0' }}\
+    name: "Backup, break and restore cluster: PE ${{ github.event.inputs.version || '2025.5.0' }}\
       \ ${{ github.event.inputs.architecture || 'extra-large' }} on ${{ github.event.inputs.image || 'almalinux-cloud/almalinux-9' }}"
     runs-on: ubuntu-latest
     env:
@@ -51,7 +50,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-failover.yaml b/.github/workflows/test-failover.yaml
index cf0e1137a..8eaf77856 100644
--- a/.github/workflows/test-failover.yaml
+++ b/.github/workflows/test-failover.yaml
@@ -18,7 +18,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: "false"
+        default: 'false'
       log_level:
         description: Bolt log level
         required: false
@@ -34,8 +34,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: ["${{ github.event.inputs.version }}"]
-        image: ["${{ github.event.inputs.image }}"]
+        version: ['${{ github.event.inputs.version }}']
+        image: ['${{ github.event.inputs.image }}']
         architecture: [extra-large-with-dr]
     steps:
       - name: Start SSH session
@@ -49,7 +49,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-install-latest-dev.yaml b/.github/workflows/test-install-latest-dev.yaml
index aca9ab2b7..737323464 100644
--- a/.github/workflows/test-install-latest-dev.yaml
+++ b/.github/workflows/test-install-latest-dev.yaml
@@ -22,7 +22,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: "false"
+        default: 'false'
 jobs:
   test-install:
     name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
@@ -34,8 +34,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        architecture: ["${{ github.event.inputs.architecture }}"]
-        image: ["${{ github.event.inputs.image }}"]
+        architecture: ['${{ github.event.inputs.architecture }}']
+        image: ['${{ github.event.inputs.image }}']
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -48,7 +48,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml b/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml
index 93cf96a25..0688d0351 100644
--- a/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml
+++ b/.github/workflows/test-install-latest-xlarge-dev-nightly.yaml
@@ -8,7 +8,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: "false"
+        default: 'false'
 jobs:
   test-install:
     name: PE nightly using ${{ matrix.architecture }} on ${{ matrix.image }}
@@ -34,7 +34,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-install-matrix.yaml b/.github/workflows/test-install-matrix.yaml
index f21482763..d9b3280da 100644
--- a/.github/workflows/test-install-matrix.yaml
+++ b/.github/workflows/test-install-matrix.yaml
@@ -44,7 +44,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-install.yaml b/.github/workflows/test-install.yaml
index ca1eb0924..24b6e35dd 100644
--- a/.github/workflows/test-install.yaml
+++ b/.github/workflows/test-install.yaml
@@ -18,7 +18,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: "false"
+        default: 'false'
 jobs:
   test-install:
     name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
@@ -30,9 +30,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        architecture: ["${{ github.event.inputs.architecture }}"]
-        version: ["${{ github.event.inputs.version }}"]
-        image: ["${{ github.event.inputs.image }}"]
+        architecture: ['${{ github.event.inputs.architecture }}']
+        version: ['${{ github.event.inputs.version }}']
+        image: ['${{ github.event.inputs.image }}']
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -45,7 +45,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-legacy-compilers.yaml b/.github/workflows/test-legacy-compilers.yaml
index ab7c39baa..8dcc983b5 100644
--- a/.github/workflows/test-legacy-compilers.yaml
+++ b/.github/workflows/test-legacy-compilers.yaml
@@ -28,7 +28,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: "false"
+        default: 'false'
 jobs:
   convert_compiler:
     name: Convert compilers to legacy
@@ -49,7 +49,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-legacy-upgrade.yaml b/.github/workflows/test-legacy-upgrade.yaml
index 284a57631..63ab3377c 100644
--- a/.github/workflows/test-legacy-upgrade.yaml
+++ b/.github/workflows/test-legacy-upgrade.yaml
@@ -28,7 +28,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: "false"
+        default: 'false'
 jobs:
   upgrade_with_legacy_compilers:
     name: Upgrade PE with legacy compilers
@@ -49,7 +49,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-migration.yaml b/.github/workflows/test-migration.yaml
index ffcea00b5..cde1e256d 100644
--- a/.github/workflows/test-migration.yaml
+++ b/.github/workflows/test-migration.yaml
@@ -26,8 +26,7 @@ on:
   workflow_dispatch: {}
 jobs:
   test-migration:
-    name:
-      PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
+    name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
       PE upgrade? ${{ matrix.new_pe_version }}
     runs-on: ubuntu-latest
     env:
@@ -77,7 +76,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-replace-failed-postgresql.yaml b/.github/workflows/test-replace-failed-postgresql.yaml
index 9df6adc43..e405d7f1c 100644
--- a/.github/workflows/test-replace-failed-postgresql.yaml
+++ b/.github/workflows/test-replace-failed-postgresql.yaml
@@ -47,7 +47,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-upgrade-latest-dev.yaml b/.github/workflows/test-upgrade-latest-dev.yaml
index 4c652bc16..703cc431f 100644
--- a/.github/workflows/test-upgrade-latest-dev.yaml
+++ b/.github/workflows/test-upgrade-latest-dev.yaml
@@ -27,11 +27,10 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: "false"
+        default: 'false'
 jobs:
   test-upgrade:
-    name:
-      PE ${{ matrix.version }} to latest dev using ${{ matrix.architecture }}
+    name: PE ${{ matrix.version }} to latest dev using ${{ matrix.architecture }}
       on ${{ matrix.image }}
     runs-on: ubuntu-latest
     env:
@@ -41,9 +40,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        architecture: ["${{ github.event.inputs.architecture }}"]
-        version: ["${{ github.event.inputs.version }}"]
-        image: ["${{ github.event.inputs.image }}"]
+        architecture: ['${{ github.event.inputs.architecture }}']
+        version: ['${{ github.event.inputs.version }}']
+        image: ['${{ github.event.inputs.image }}']
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -56,7 +55,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml
index 391ece4da..c11df31ea 100644
--- a/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml
+++ b/.github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml
@@ -5,8 +5,7 @@ on:
     - cron: 0 3 * * *
 jobs:
   test-upgrade:
-    name:
-      PE ${{ matrix.version }} to nightly dev using ${{ matrix.architecture }}
+    name: PE ${{ matrix.version }} to nightly dev using ${{ matrix.architecture }}
       on ${{ matrix.image }}
     runs-on: ubuntu-latest
     env:
@@ -25,7 +24,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-upgrade-matrix.yaml b/.github/workflows/test-upgrade-matrix.yaml
index 2efec6f37..18fdab95f 100644
--- a/.github/workflows/test-upgrade-matrix.yaml
+++ b/.github/workflows/test-upgrade-matrix.yaml
@@ -26,8 +26,7 @@ on:
   workflow_dispatch: {}
 jobs:
   test-upgrade:
-    name:
-      PE ${{ matrix.version }} to ${{ matrix.version_to_upgrade }} ${{ matrix.architecture }}
+    name: PE ${{ matrix.version }} to ${{ matrix.version_to_upgrade }} ${{ matrix.architecture }}
       on ${{ matrix.image }}
     runs-on: ubuntu-latest
     env:
@@ -37,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        architecture: [standard, extra-large] # removing xl-with dr until PE-40902 is addressed
+        architecture: [standard, extra-large]  # removing xl-with dr until PE-40902 is addressed
         version: [2021.7.9, 2023.8.5]
         version_to_upgrade: [2021.7.9, 2023.8.5, 2025.5.0]
         image: [almalinux-cloud/almalinux-9]
@@ -63,7 +62,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}
diff --git a/.github/workflows/test-upgrade.yaml b/.github/workflows/test-upgrade.yaml
index 42103679c..358ff3e0c 100644
--- a/.github/workflows/test-upgrade.yaml
+++ b/.github/workflows/test-upgrade.yaml
@@ -30,7 +30,7 @@ on:
       ssh-debugging:
         description: Boolean; whether or not to pause for ssh debugging
         required: true
-        default: "false"
+        default: 'false'
 jobs:
   test-upgrade:
     name: PE ${{ matrix.version }} ${{ matrix.architecture }} on ${{ matrix.image }}
@@ -43,10 +43,10 @@ jobs:
       fail-fast: false
       matrix:
         download_mode: [direct]
-        architecture: ["${{ github.event.inputs.architecture }}"]
-        version: ["${{ github.event.inputs.version }}"]
-        version_to_upgrade: ["${{ github.event.inputs.upgrade_version }}"]
-        image: ["${{ github.event.inputs.image }}"]
+        architecture: ['${{ github.event.inputs.architecture }}']
+        version: ['${{ github.event.inputs.version }}']
+        version_to_upgrade: ['${{ github.event.inputs.upgrade_version }}']
+        image: ['${{ github.event.inputs.image }}']
     steps:
       - name: Start SSH session
         if: ${{ github.event.inputs.ssh-debugging == 'true' }}
@@ -59,7 +59,7 @@ jobs:
       - name: Activate Ruby 3.1
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.1"
+          ruby-version: '3.1'
           bundler-cache: true
       - name: Print bundle environment
         if: ${{ github.repository_owner == 'puppetlabs' }}