diff --git a/roles/legacy-install-afs-with-puppet/files/manifest.pp b/roles/legacy-install-afs-with-puppet/files/manifest.pp
index e02c2452ac..38fdd1a9d5 100644
--- a/roles/legacy-install-afs-with-puppet/files/manifest.pp
+++ b/roles/legacy-install-afs-with-puppet/files/manifest.pp
@@ -1,4 +1,4 @@
-class { 'openafs::client':
+class { '::openafs::client':
   cell         => 'openstack.org',
   realm        => 'OPENSTACK.ORG',
   admin_server => 'kdc.openstack.org',
diff --git a/roles/legacy-install-afs-with-puppet/tasks/main.yaml b/roles/legacy-install-afs-with-puppet/tasks/main.yaml
index b0fafa01cd..7aa6cb0a54 100644
--- a/roles/legacy-install-afs-with-puppet/tasks/main.yaml
+++ b/roles/legacy-install-afs-with-puppet/tasks/main.yaml
@@ -4,7 +4,7 @@
     chdir: "{{ ansible_user_dir }}/src/git.openstack.org/openstack-infra/system-config"
   environment:
     # Skip setting up pip, our images have already done this.
-    SETUP_PIP: false
+    SETUP_PIP: "false"
   become: yes
 
 - name: Copy reduced scope modules.env into place
@@ -26,3 +26,4 @@
 - name: Run puppet
   puppet:
     manifest: "{{ ansible_user_dir }}/manifest.pp"
+  become: yes