diff --git a/image/scripts/hadoop-single-setup.sh b/image/scripts/hadoop-single-setup.sh
index 5c5504d48218d96277d13292a4f6eca61c2737f1..1450fda509e09a375e5c212dbd7f2ed834c43e76 100755
--- a/image/scripts/hadoop-single-setup.sh
+++ b/image/scripts/hadoop-single-setup.sh
@@ -12,22 +12,15 @@ fi
 
 mkdir /data 2>/dev/null || :
 
-apt-get install -y puppet-master
-hostname -f > /etc/puppet/autosign.conf
-systemctl enable puppet-master
-service puppet-master restart
-
-puppet config set server `hostname -f`
-puppet config set --section agent http_read_timeout 30
 f=/etc/puppet/code/environments/production/manifests/site.pp
 while grep -q '@SECRET@' $f; do
 	k="`dd if=/dev/random bs=27 count=1 2>/dev/null | base64 -`"
 	sed -i "0,/@SECRET@/s,@SECRET,$k," $f
 done
-puppet agent --test 2>&1 | tee stage1.log
+puppet apply --test $f 2>&1 | tee stage1.log
 if test $? = 0 -o $? = 2; then
 	sed -i "s/^\\(\$hdfs_deployed\\s*=\\s*\\).*/\\1true/" $f
-	puppet agent --test 2>&1 | tee stage2.log
+	puppet apply --test $f 2>&1 | tee stage2.log
 else
 	echo "First stage setup failed"
 	exit $?