diff --git a/recipe-template/build.gradle b/recipe-template/build.gradle
index da0fe43..9d622bb 100644
--- a/recipe-template/build.gradle
+++ b/recipe-template/build.gradle
@@ -8,7 +8,7 @@
 	}
 	dependencies {
 		classpath "gradle.plugin.org.eclipse.virgo.bundlor:bundlor-plugin:0.2"
-		classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.4"
+		classpath "gradle.plugin.com.eclipsesource.dockerizor:dockerizor:0.6"
         classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.0'
 	}
 }
@@ -141,6 +141,32 @@
 	}
 }
 
+configure(dockerProjects) {
+	// add the build task 'clean'
+	apply plugin: 'base'
+
+	// add the build task 'dockerize'
+	apply plugin: 'com.eclipsesource.dockerizor'
+
+	dockerizor {
+		maintainer = 'Florian Waibel <fwaibel@eclipsesource.com>'
+
+		javaImage = 'java:openjdk-8u72-jre'
+
+		virgoVersion = 'latest'
+		hudsonJobName = 'gradle-build'
+
+		createLocalCopy = System.properties['local.build'] == 'true'
+		removeAdminConsole = System.properties['local.build'] != 'true'
+
+		virgoFlavour = 'VTS'
+		virgoVersion = 'latest'
+	}
+
+	dockerize.dependsOn configurations.repositoryExt
+	dockerize.dependsOn configurations.repositoryUsr
+}
+
 task wrapper(type: Wrapper) {
     gradleVersion = '2.10'
 }
diff --git a/recipe-template/recipe-xyz-app/build.gradle b/recipe-template/recipe-xyz-app/build.gradle
index b0a7350..4a284c6 100644
--- a/recipe-template/recipe-xyz-app/build.gradle
+++ b/recipe-template/recipe-xyz-app/build.gradle
@@ -1,26 +1,8 @@
-// add the build task 'clean'
-apply plugin: 'base'
-
-// add the build task 'dockerize'
-apply plugin: "com.eclipsesource.dockerizor"
-
-dockerize.dependsOn ':org.eclipse.virgo.samples.recipe.xyz:build'
-
 dockerizor {
 	repository = 'virgo-recipe/xyz-app'
-	maintainer = 'Florian Waibel <fwaibel@eclipsesource.com>'
     description = 'Virgo Recipe XYZ created with Gradle Plugin: com.eclipsesource.dockerizor'
 
-	javaImage = 'java:openjdk-8u72-jre'
-
-    createLocalCopy = true
-
-	virgoFlavour = 'VTS'
-	virgoVersion = 'latest'
-
 	pickupFiles = ['recipe-xyz.plan']
-
-	removeAdminConsole = false
 }
 
 repositories {
diff --git a/recipe-template/recipe-xyz-runtime/build.gradle b/recipe-template/recipe-xyz-runtime/build.gradle
index 1170c75..bb155e8 100644
--- a/recipe-template/recipe-xyz-runtime/build.gradle
+++ b/recipe-template/recipe-xyz-runtime/build.gradle
@@ -1,22 +1,6 @@
-// add the build task 'clean'
-apply plugin: 'base'
-
-// add the build task 'dockerize'
-apply plugin: "com.eclipsesource.dockerizor"
-
 dockerizor {
 	repository = 'virgo-recipe/xyz-runtime'
-	maintainer = 'Florian Waibel <fwaibel@eclipsesource.com>'
 	description = 'Virgo Recipe XYZ (runtime-only) created with Gradle Plugin: com.eclipsesource.dockerizor'
-	
-	javaImage = 'java:openjdk-8u72-jre'
-
-    createLocalCopy = true
-
-	virgoFlavour = 'VTS'
-	virgoVersion = 'latest'
-
-	removeAdminConsole = false
 }
 
 repositories {