diff --git a/deploy.tf b/deploy.tf
index 70cdee6ecce184af43db6a1839d64b1bfdb6d36b..159ab3cd61ee3bfd7c9a3fe039bb8435997e8617 100644
--- a/deploy.tf
+++ b/deploy.tf
@@ -94,6 +94,7 @@ packages:
 puppet:
   conf:
     agent:
+      http_read_timeout: 30
       server: ${local.master_fqdn}
 
 write_files:
diff --git a/image/scripts/hadoop-single-setup.sh b/image/scripts/hadoop-single-setup.sh
index abc27c6e3876f99bcb9e2a002601911df5a9880b..0e457e43d9ccb920cc426d2802c149d78eec6920 100755
--- a/image/scripts/hadoop-single-setup.sh
+++ b/image/scripts/hadoop-single-setup.sh
@@ -18,6 +18,7 @@ systemctl enable puppet-master
 service puppet-master restart
 
 puppet config set server `hostname -f`
+puppet config set --section agent http_read_timeout 30
 puppet agent --test 2>&1 | tee stage1.log
 if test $? = 0 -o $? = 2; then
 	sed -i "s/^\\(\$hdfs_deployed\\s*=\\s*\\).*/\\1true/" /etc/puppet/code/environments/production/manifests/site.pp