diff --git a/tasks/configure.yml b/tasks/configure.yml
index 02782c7..036a58c 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -1,7 +1,7 @@
 ---
 - name: Ensure puppet server master section is configured
   ini_file:
-    path: /etc/puppetlabs/puppet.conf
+    path: /etc/puppetlabs/puppet/puppet.conf
     section: master
     option: "{{ item.key }}"
     value: "{{ item.value }}"
@@ -13,7 +13,7 @@
 
 - name: Ensure puppet server server section is configured
   ini_file:
-    path: /etc/puppetlabs/puppet.conf
+    path: /etc/puppetlabs/puppet/puppet.conf
     section: server
     option: "{{ item.key }}"
     value: "{{ item.value }}"
@@ -122,3 +122,8 @@
     name: puppetserver
     state: started
     enabled: true
+
+- name: Ensure r10k is configured
+  copy:
+    dest: /etc/puppetlabs/r10k/r10k.yaml
+    content: "{{ r10k_config | to_nice_yaml }}"
\ No newline at end of file