diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml
index 89a446756..f2c56fd7b 100644
--- a/.github/workflows/ce-provision-publish-docs.yml
+++ b/.github/workflows/ce-provision-publish-docs.yml
@@ -58,6 +58,7 @@ jobs:
       # First build and publish the markdown docs
       - name: Build and commit table of contents and README files back to the repo
         run: |
+          /usr/bin/git fetch origin 2.x
           /usr/bin/git merge origin/${{ github.event.pull_request.base.ref }}
           /bin/sh contribute/toc.sh
           /usr/bin/find . -name "*.md" | xargs git add
diff --git a/roles/aws/aws_provision_ec2_keypair/defaults/main.yml b/roles/aws/aws_provision_ec2_keypair/defaults/main.yml
index 62300898b..efd4af9c0 100644
--- a/roles/aws/aws_provision_ec2_keypair/defaults/main.yml
+++ b/roles/aws/aws_provision_ec2_keypair/defaults/main.yml
@@ -2,5 +2,5 @@
 aws_provision_ec2_keypair:
   aws_profile: "{{ _aws_profile }}"
   region: "{{ _aws_region }}"
-  key_name: "{{ ce_provision.username }}@{{ ansible_hostname }}"
-  key_type: "{{ ce_provision.ssh_key_type }}" # defaults to ed25519 in the ce_provision role, set to rsa to or ecdsa as necessary
+  key_name: "{{ _ce_provision_username }}@{{ ansible_hostname }}"
+  key_type: ed25519 # defaults to ed25519 as used in the ce_provision role, set to rsa to or ecdsa as necessary
diff --git a/roles/aws/aws_provision_ec2_keypair/tasks/main.yml b/roles/aws/aws_provision_ec2_keypair/tasks/main.yml
index 81de64d72..4eb8f2c98 100644
--- a/roles/aws/aws_provision_ec2_keypair/tasks/main.yml
+++ b/roles/aws/aws_provision_ec2_keypair/tasks/main.yml
@@ -2,6 +2,6 @@
 - name: Create EC2 key pair.
   amazon.aws.ec2_key:
     name: "{{ aws_provision_ec2_keypair.key_name }}"
-    key_material: "{{ lookup('file', '/home/{{ ce_provision.username }}/.ssh/id_{{ aws_provision_ec2_keypair.key_type }}.pub') }}"
+    key_material: "{{ lookup('file', '/home/{{ _ce_provision_username }}/.ssh/id_{{ aws_provision_ec2_keypair.key_type }}.pub') }}"
     profile: "{{ aws_provision_ec2_keypair.aws_profile }}"
     region: "{{ aws_provision_ec2_keypair.region }}"