diff --git a/tools/scripts/ansible/Vagrantfile b/tools/scripts/ansible/Vagrantfile
index a26cc1bae4a..2d9233b6e60 100644
--- a/tools/scripts/ansible/Vagrantfile
+++ b/tools/scripts/ansible/Vagrantfile
@@ -7,7 +7,7 @@ Vagrant.configure("2") do |config|
   end
   # increase the boot timeout
   config.vm.boot_timeout = 600
-  config.vm.box = "hashicorp/bionic64";
+  config.vm.box = "ubuntu/jammy64";
   config.vm.define "surveytool"
   config.vm.hostname = "surveytool"
   # forward http and https
@@ -19,6 +19,7 @@ Vagrant.configure("2") do |config|
     apt-get install -y python3 sudo
   SHELL
   config.vm.provision "ansible" do |ansible|
+    ansible.compatibility_mode = "2.0"
     ansible.playbook = "vagrant-playbook.yml"
   end
 end
diff --git a/tools/scripts/ansible/cldr-apps-playbook.yml b/tools/scripts/ansible/cldr-apps-playbook.yml
index 8aa6e38a42d..79819d187f0 100644
--- a/tools/scripts/ansible/cldr-apps-playbook.yml
+++ b/tools/scripts/ansible/cldr-apps-playbook.yml
@@ -47,7 +47,6 @@
       notify: Restart OpenLiberty
     - name: Checkout CLDR trunk
       become: yes
-      become_user: "{{ cldr_surveytool_user }}"
       git:
         repo: https://github.com/unicode-org/cldr.git
         dest: "{{ cldr_trunk_path }}"
@@ -57,6 +56,10 @@
         # this is a deep clone because we will need to keep updating
         # it with history. It does not include LFS as that
         # is not needed for the surveytool.
+    - name: Fix CLDR trunk perms
+      file:
+        path: "{{ cldr_trunk_path }}"
+        owner: "{{ cldr_surveytool_user }}"
   handlers:
     - name: Restart OpenLiberty
       service: