diff --git a/tasks/main.yml b/tasks/main.yml
index dd9634a..c7f7ea7 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -52,6 +52,25 @@
     - hiera_file_paths.paths_dict.paths
     - st.results
 
+- name: copy puppet modules
+  synchronize:
+    src: "{{ manifest_base }}/{{ hieraenvironment }}"
+    dest: "{{ manifest_base }}"
+  when: copy_puppet is defined and copy_puppet and manifest_base is defined
+
+- name: copy system puppet modules
+  synchronize:
+    src: /etc/puppet/modules
+    dest: /etc/puppet
+  when: copy_puppet is defined and copy_puppet and manifest_base is defined
+
+- name: ensure hieradata manifest link is present
+  file:
+    src: "{{ hieradata }}"
+    dest: "{{ manifest_base }}/hieradata"
+    state: link
+  when: copy_hieradata is defined and copy_hieradata
+
 - name: run puppet
   puppet:
     puppetmaster: "{{ puppetmaster|default(omit) }}"