diff --git a/build-common-plugin.xml b/build-common-plugin.xml
index 06398476e2ad..d3083cb323ed 100644
--- a/build-common-plugin.xml
+++ b/build-common-plugin.xml
@@ -105,6 +105,7 @@
 				<arg value="service.sql.sequences.file=sequences.sql" />
 				<arg value="service.target.entity.name=${service.target.entity.name}" />
 				<arg value="service.test.dir=@{service.test.dir}" />
+				<arg value="spring.configurator.enabled=${spring.configurator.enabled}" />
 			</java>
 
 			<if>
diff --git a/build.properties b/build.properties
index 6ab36859eeb0..079061f694d4 100644
--- a/build.properties
+++ b/build.properties
@@ -545,6 +545,12 @@
     sass.compiler.class.name=jni
     #sass.compiler.class.name=ruby
 
+##
+## Service Builder
+##
+
+    spring.configurator.enabled=false
+
 ##
 ## Snapshot
 ##