diff --git a/.github/workflows/ce-provision-publish-docs.yml b/.github/workflows/ce-provision-publish-docs.yml
index 1c9653eee..b7532a67b 100644
--- a/.github/workflows/ce-provision-publish-docs.yml
+++ b/.github/workflows/ce-provision-publish-docs.yml
@@ -58,8 +58,11 @@ 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 pull origin docs-2.x
-          /usr/bin/git fetch origin 2.x
+          /usr/bin/git pull origin docs-${{ github.event.pull_request.base.ref }}
+          /usr/bin/git fetch origin ${{ github.event.pull_request.base.ref }}
+          /usr/bin/git checkout -b ${{ github.event.pull_request.base.ref }}
+          /usr/bin/git pull origin ${{ github.event.pull_request.base.ref }}
+          /usr/bin/git checkout docs-${{ github.event.pull_request.base.ref }}
           /usr/bin/git merge origin/${{ github.event.pull_request.base.ref }} --allow-unrelated-histories
           /bin/sh contribute/toc.sh
           /usr/bin/find . -name "*.md" | xargs git add
diff --git a/docs/_Sidebar.md b/docs/_Sidebar.md
index 540826797..f6637bbc3 100644
--- a/docs/_Sidebar.md
+++ b/docs/_Sidebar.md
@@ -3,18 +3,11 @@
   - [Install](install)
   - [Usage](scripts)
   - [Roles](roles)
-     - [Init role](/roles/_init)
-     - ["Meta" roles that group individual roles together.](/roles/_meta)
-       - [AWS account](/roles/_meta/aws_account)
-       - [AWS client](/roles/_meta/aws_client_instance)
-       - [AWS region](/roles/_meta/aws_region)
-     - [\_overrides.](/roles/_overrides)
      - [AWS Infrastructure](/roles/aws)
-       - [AWS Network Info](/roles/aws/_aws_network_info)
        - [AWS ACL](/roles/aws/aws_acl)
        - [AWS Certificate Manager](/roles/aws/aws_acm)
-       - [AWS AMI](/roles/aws/aws_ami)
        - [AWS AMI ASG Cleanup](/roles/aws/aws_ami_asg_cleanup)
+       - [AWS AMI](/roles/aws/aws_ami)
        - [AWS Backup](/roles/aws/aws_backup)
        - [AWS Backup Validation](/roles/aws/aws_backup_validation)
        - [AWS CloudFront distribution](/roles/aws/aws_cloudfront_distribution)
@@ -27,6 +20,7 @@
        - [AWS ElastiCache](/roles/aws/aws_elasticache)
        - [AWS IAM EC2](/roles/aws/aws_iam_role)
        - [AWS IAM SAML](/roles/aws/aws_iam_saml)
+       - [AWS Network Info](/roles/aws/_aws_network_info)
        - [AWS OpenSearch](/roles/aws/aws_opensearch)
        - [AWS key pair.](/roles/aws/aws_provision_ec2_keypair)
        - [AWS RDS](/roles/aws/aws_rds)
@@ -40,8 +34,8 @@
        - [VPC](/roles/aws/aws_vpc_subnet)
      - [Contributed roles](/roles/contrib)
      - [Debian Packages](/roles/debian)
-       - [Ansible](/roles/debian/ansible)
        - [Ansible Galaxy](/roles/debian/ansible_galaxy)
+       - [Ansible](/roles/debian/ansible)
        - [APACHE](/roles/debian/apache)
        - [Apparmor](/roles/debian/apparmor)
        - [Extra packages](/roles/debian/apt_extra_packages)
@@ -81,10 +75,10 @@
        - [PAM LinOTP](/roles/debian/pam_linotp)
        - [PHP terminal client](/roles/debian/php-cli)
        - [PHP common components](/roles/debian/php-common)
-       - [PHP-FPM](/roles/debian/php-fpm)
        - [PHP Composer](/roles/debian/php_composer)
-       - [PHP XDebug](/roles/debian/php_xdebug)
+       - [PHP-FPM](/roles/debian/php-fpm)
        - [phpMyAdmin](/roles/debian/phpmyadmin)
+       - [PHP XDebug](/roles/debian/php_xdebug)
        - [Postfix](/roles/debian/postfix)
        - [Process Manager](/roles/debian/process_manager)
        - [Python Boto](/roles/debian/python_boto)
@@ -101,3 +95,9 @@
        - [User Ansible](/roles/debian/user_ansible)
        - [varnish_config](/roles/debian/varnish_config)
        - [wazuh](/roles/debian/wazuh)
+     - [Init role](/roles/_init)
+     - ["Meta" roles that group individual roles together.](/roles/_meta)
+       - [AWS account](/roles/_meta/aws_account)
+       - [AWS client](/roles/_meta/aws_client_instance)
+       - [AWS region](/roles/_meta/aws_region)
+     - [\_overrides.](/roles/_overrides)
diff --git a/roles/debian/sops/defaults/main.yml b/roles/debian/sops/defaults/main.yml
index 969712ff6..ea24d0ff6 100644
--- a/roles/debian/sops/defaults/main.yml
+++ b/roles/debian/sops/defaults/main.yml
@@ -1,3 +1,3 @@
 ---
 sops:
-  version: 3.7.3 # see https://github.com/mozilla/sops/releases
+  version: 3.9.3 # see https://github.com/mozilla/sops/releases
diff --git a/roles/debian/sops/tasks/main.yml b/roles/debian/sops/tasks/main.yml
index f290d2746..a1de2f71b 100644
--- a/roles/debian/sops/tasks/main.yml
+++ b/roles/debian/sops/tasks/main.yml
@@ -3,3 +3,4 @@
   ansible.builtin.apt:
     deb: "https://github.com/mozilla/sops/releases/download/v{{ sops.version }}/sops_{{ sops.version }}_amd64.deb"
     state: present
+    force: true # avoids errors if newer version installed