diff --git a/defaults/main.yml b/defaults/main.yml
index 5dbb131..9411169 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -15,3 +15,4 @@ puppet_environmentpath: '$confdir/environments'
 puppet_hiera_datadir: '/opt/system-config/'
 puppet_environment_basedir: '/opt/system-config/'
 puppet_environment: production
+puppet_timeout: 30m
diff --git a/tasks/main.yml b/tasks/main.yml
index 0836240..3041cb0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -66,6 +66,7 @@
       environment: "{{ puppet_environment|default(omit) }}"
       noop: "{{ puppet_noop|default(omit) }}"
       debug: "{{ puppet_debug|default(omit) }}"
+      timeout: "{{ puppet_timeout|default(omit) }}"
 - always:
   - name: find logs
     shell: "ls -tr /var/lib/puppet/reports/{{ ansible_fqdn }}/*_puppetdb.json"