diff --git a/recipes/default.rb b/recipes/default.rb
index 2c1bf5be7b76bd77d6c3aa4446c11d047a662e4e..84c83c075b835043456e29ac8b4776570998a069 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -159,6 +159,13 @@ end
 ### Provide Sources ###
 #######################
 
+file '/home/vagrant/ssh_wrapper.sh' do
+	owner 'vagrant'
+	group 'vagrant'
+	mode '0755'
+	content "#!/bin/sh\nexec /usr/bin/ssh -o \"StrictHostKeyChecking=no\" \"$@\""
+end
+
 if node['typo3_site']['repository'] != ''
 	ssh_known_hosts_entry node['typo3_site']['repository_hostname'] do
 		port node['typo3_site']['repository_port']
@@ -173,6 +180,7 @@ if node['typo3_site']['repository'] != ''
 		user 'vagrant'
 		group 'vagrant'
 		action :checkout
+		ssh_wrapper '/home/vagrant/ssh_wrapper.sh'
 	end
 end
 
@@ -269,7 +277,7 @@ template "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/typ
 end
 
 template "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/typo3conf/AdditionalConfiguration.php" do
-	source 'AdditionalConfiguration.php.erb'
+	source 'AdditionalConfiguration.php'
 	owner 'vagrant'
 	mode '0660'
 	action :create_if_missing
diff --git a/templates/default/AdditionalConfiguration.php.erb b/templates/default/AdditionalConfiguration.php
similarity index 100%
rename from templates/default/AdditionalConfiguration.php.erb
rename to templates/default/AdditionalConfiguration.php