diff --git a/README.md b/README.md
index b61da3ac1f0aaa9ace964c90dd76fc162bee29f1..441c55f63050c9d33dc6920f0bc5f2e1e1e1b019 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,16 @@ $ curl 127.0.0.1:8080
     application GIT repository. In case your application is located in a
     sub-folder, you can set this variable to a *./myapplication*.
 
+*  **APP_TARGET** (default: '')
+
+    This variable specifies a relative location to your application binary inside the
+    container.
+
+*  **MVN_ARGS** (default: '')
+
+    This variable specifies the arguments for Maven inside the container.
+
+
 ## Contributing
 
 In order to test your changes to this STI image or to the STI scripts, you can use the `test/run` script. Before that, you have to build the 'candidate' image:
diff --git a/s2i/bin/assemble b/s2i/bin/assemble
index ec5642335fdcf4ff521b3c72e789fcc73da1a71a..8021fb50ca6fa37026baa405bce87f950583e7b0 100755
--- a/s2i/bin/assemble
+++ b/s2i/bin/assemble
@@ -6,10 +6,11 @@ echo "---> Installing application source"
 cp -Rf /tmp/src/. ./
 
 echo "---> Building Spring Boot application from source"
+echo "--> # MVN_ARGS = $MVN_ARGS"
 if [ -f "mvnw" ]; then
-  ./mvnw clean install
+  ./mvnw clean install $MVN_ARGS
 else
-  mvn clean install
+  mvn clean install $MVN_ARGS
 fi
 
 # Fix source directory permissions
diff --git a/s2i/bin/run b/s2i/bin/run
index a01a76a7776c0534f4a4db594c5576e774d77446..2e3e3ef51c17930ea4681770ac04cdb1a0e5ed92 100755
--- a/s2i/bin/run
+++ b/s2i/bin/run
@@ -3,4 +3,6 @@
 set -e
 
 echo "---> Starting Spring Boot application"
-java -jar `find target -name *.jar`
+echo "--> # APP_TARGET = $APP_TARGET"
+echo "--> # JAVA_OPTS = $JAVA_OPTS"
+java $JAVA_OPTS -jar `find $APP_TARGET -name *.jar`