diff --git a/metadata.rb b/metadata.rb
index acc5e8e8d47715d2ce4dfcb54c5c9fc2d0b82028..6a2930181da7b13110972044426b096a37f8f4f9 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -3,7 +3,7 @@ maintainer 'sgalinski Internet Services'
 maintainer_email 'stefan@sgalinski.de'
 license 'Apache 2.0'
 description 'Site'
-long_description 'Sets up a website'
+long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
 version '1.0.0'
 recipe 'typo3_site::default', 'Main recipe'
 
diff --git a/recipes/default.rb b/recipes/default.rb
index 36ebd17bd3454634d1c0236731d0a375ffa77fd2..dd542c60c33b3576e551449c3cd687fe32020492 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -119,19 +119,19 @@ end
 template '/etc/apache2/ssl/sslKey.key' do
 	source 'sslKey.key'
 	owner 'vagrant'
-	group 'vagrant'
+	group data_bag['groupId']
 end
 
 template '/etc/apache2/ssl/sslKey.crt' do
 	source 'sslKey.crt'
 	owner 'vagrant'
-	group 'vagrant'
+	group data_bag['groupId']
 end
 
 # create vHost directory
 directory "#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}" do
 	owner 'vagrant'
-	group 'vagrant'
+	group data_bag['groupId']
 	mode '0755'
 	action :create
 end
@@ -161,7 +161,7 @@ end
 
 file '/home/vagrant/ssh_wrapper.sh' do
 	owner 'vagrant'
-	group 'vagrant'
+	group data_bag['groupId']
 	mode '0755'
 	content "#!/bin/sh\nexec /usr/bin/ssh -o \"StrictHostKeyChecking=no\" \"$@\""
 end
@@ -177,7 +177,7 @@ if node['typo3_site']['repository'] != ''
 		revision 'master'
 		timeout 100000
 		user 'vagrant'
-		group 'vagrant'
+		group data_bag['groupId']
 		action :checkout
 		ssh_wrapper '/home/vagrant/ssh_wrapper.sh'
 	end
@@ -191,7 +191,7 @@ bash 'Setup TYPO3' do
 	cwd '/home/vagrant/'
 
 	user 'vagrant'
-	group 'vagrant'
+	group data_bag['groupId']
 	timeout 3000000
 	only_if { node['typo3_site']['download_typo3'] }
 
@@ -236,7 +236,7 @@ node['typo3_site']['sync_directories'].each do |sync_data|
 
 	bash 'Synchronize ' + sync_data['local'] do
 		user 'vagrant'
-		group 'vagrant'
+		group data_bag['groupId']
 		timeout 3000000
 		only_if {
 			sync_data['sync'] or not ::File.exists?("#{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/#{sync_data['local']}")
@@ -349,7 +349,7 @@ node['typo3_site']['sync_databases'].each do |database_data|
 		# download the sql data
 		bash 'Download Dump for ' + database_data['database_name'] do
 			user 'vagrant'
-			group 'vagrant'
+			group data_bag['groupId']
 			timeout 3000000
 			code <<-EOF
 			rsync --delete -auvz --progress -e "ssh -p #{database_data['dump_port']} -o StrictHostKeyChecking=no" \
@@ -417,7 +417,7 @@ if node['typo3_site']['solr']['init']
 	execute 'solr-updateConnections' do
 		command "php #{node['typo3_site']['webroot']}/#{node['typo3_site']['hostname']}/typo3/cli_dispatch.phpsh solr updateConnections || true"
 		user 'vagrant'
-		group 'vagrant'
+		group data_bag['groupId']
 		action :run
 	end
 end
\ No newline at end of file