diff --git a/build.gradle b/build.gradle
index 59433623b239cb0632422971708d14228444614d..95bc2f13636a4a75b308e02563482c798cbbcbc6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'asciidoctor'
+apply plugin: 'cargo'
 apply plugin: 'eclipse-wtp'
 apply plugin: 'findbugs'
 apply plugin: 'jacoco'
@@ -64,6 +65,7 @@ buildscript {
 
 	dependencies {
 		classpath 'com.eriwen:gradle-js-plugin:1.9.0'
+		classpath 'org.gradle.api.plugins:gradle-cargo-plugin:1.4'
 		classpath 'org.gradle.api.plugins:gradle-vagrant-plugin:0.3'
 		classpath 'org.asciidoctor:asciidoctor-gradle-plugin:0.7.0'
 	}
@@ -103,6 +105,21 @@ asciidoctor {
 	outputDir = file("$buildDir/docs/asciidoctor")
 }
 
+cargo {
+	containerId = 'tomcat7x'
+	port = 8080
+
+	deployable {
+		context = "${isRelease ? 'isochrone' : 'nightly'}"
+	}
+
+	remote {
+		hostname = 'dbis-isochrone.uibk.ac.at'
+		username = 'admin'
+		password = 'admin'
+	}
+}
+
 checkstyle {
 	ignoreFailures = true
 	showViolations = false
@@ -330,8 +347,15 @@ task vagrantPrepare << {
 	}
 }
 
+// remove unconfigured tasks
+
+tasks.remove(cargoRunLocal)
+tasks.remove(cargoStartLocal)
+tasks.remove(cargoStopLocal)
+
 // task dependencies
 
+tasks.cargoRedeployRemote.dependsOn assemble
 tasks.jsDoc.dependsOn tasks.processResources
 tasks.jsHint.dependsOn tasks.processResources
 tasks.test.finalizedBy tasks.cleanTestResults
diff --git a/etc/vagrant/conf/tomcat-users.xml b/etc/vagrant/conf/tomcat-users.xml
index 2b4676b920df29ef172615c889592c863ce5e37d..2a0919c898f1fe3d7e94ea31fe06e02fa19bd7e3 100644
--- a/etc/vagrant/conf/tomcat-users.xml
+++ b/etc/vagrant/conf/tomcat-users.xml
@@ -1,7 +1,9 @@
 <tomcat-users>
   <role rolename="admin" />
   <role rolename="admin-gui" />
+  <role rolename="admin-script" />
   <role rolename="manager" />
   <role rolename="manager-gui" />
-  <user name="admin" password="admin" roles="admin,admin-gui,manager,manager-gui" />
+  <role rolename="manager-script" />
+  <user name="admin" password="admin" roles="admin,admin-gui,admin-script,manager,manager-gui,manager-script" />
 </tomcat-users>