diff --git a/attributes/default.rb b/attributes/default.rb
index 896b90310d1682351faccbbc84e88fd7443acefb..e75cfe61c2a31766bd169cb92558bbdace80495a 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -4,6 +4,7 @@ default['typo3_site']['site_configuration'] = 'SiteConfiguration.php'
 default['typo3_site']['server_aliases'] = 'www.site.dev'
 default['typo3_site']['hostname'] = 'site.dev'
 default['typo3_site']['web_directory'] = ''
+default['typo3_site']['allow_http2'] = false
 default['typo3_site']['repository'] = ''
 default['typo3_site']['repository_hostname'] = ''
 default['typo3_site']['repository_port'] = 22
diff --git a/recipes/default.rb b/recipes/default.rb
index 1ba630304456d8e2129d188055af5cc7747fe057..60952c7ab054f7dfd304c39f5317377b232700cb 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -55,7 +55,7 @@ if node['platform_version'] == '16.04'
 		action :add
 	end
 
-	execute 'apt-get -y update'
+	execute 'apt -y update'
 end
 
 include_recipe 'graphicsmagick'
@@ -72,6 +72,12 @@ if node['platform_version'] == '16.04'
 
 	apache_module 'http2' do
 		enable true
+		only_if { node['typo3_site']['allow_http2'] }
+	end
+
+	apache_module 'http2' do
+		disable true
+		only_if { not node['typo3_site']['allow_http2'] }
 	end
 else
 	include_recipe 'apache2::mod_php5'