diff --git a/.travis.yml b/.travis.yml
index 36990e3e7..16c7c194d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,7 +36,7 @@ script:
   - "sh -e /etc/init.d/xvfb start"
   - sleep 3 # give xvfb some time to start
   - nvm install $NODE_VERSION
-    && ci/change_version.sh -m . -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
+    && ci/change_version.sh -m .
     && ci/test.sh $DB $PROJECT
 
 jobs:
@@ -45,7 +45,7 @@ jobs:
       install:
         - nvm install $NODE_VERSION
           && (cd web && npm install && npm rebuild node-sass)
-          && ci/change_version.sh -m . -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
+          && ci/change_version.sh -m .
       script:
         - (cd web && npm run build:prod)
           && mvn clean install -q -DskipTests -Dmaven.javadoc.skip -P history.plugin
@@ -65,7 +65,7 @@ jobs:
     - stage: "Release / Deploy"
       name: "Update Pom's stage"
       script: 
-        - ci/change_version.sh -i -m . -swarm lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
+        - ci/change_version.sh -i -m .
           && ci/commitPoms.sh lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
       if: repo = env(DEPLOY_REPO) AND tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$
     - stage: "Release / Deploy"
diff --git a/ci/change_version.sh b/ci/change_version.sh
index 7a5252145..961c53774 100755
--- a/ci/change_version.sh
+++ b/ci/change_version.sh
@@ -67,15 +67,6 @@ function main {
         shift # past argument
         shift # past value
         ;;
-      -swarm)
-        if [[ -z "$2" || "$2" == -* ]]; then
-          echo "missing parameter for argument '-swarm'" >&2
-          exit 1
-        fi
-        SWARM="$2"
-        shift # past argument
-        shift # past value
-        ;;
       *) # unknown option
         echo "unknown parameter $1" >&2
         exit 1
@@ -93,10 +84,6 @@ function main {
     for dir in ${MODULES[@]}; do
       change_version "$dir" "$version"
     done
-
-    if [[ -n "$SWARM" ]]; then
-      sed -i "s/pro.taskana:taskana-core.*-SNAPSHOT/pro.taskana:taskana-core:$version/" "$SWARM"
-    fi
   else
     echo "skipped version change because this is not a release build"
   fi
diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml
index 8a2c41d86..76970fb34 100644
--- a/lib/taskana-cdi/pom.xml
+++ b/lib/taskana-cdi/pom.xml
@@ -33,15 +33,15 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.wildfly.swarm</groupId>
+			<groupId>io.thorntail</groupId>
 			<artifactId>jaxrs</artifactId>
-			<version>${version.wildfly.swarm}</version>
+			<version>${version.thorntail}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.wildfly.swarm</groupId>
+			<groupId>io.thorntail</groupId>
 			<artifactId>cdi</artifactId>
-			<version>${version.wildfly.swarm}</version>
+			<version>${version.thorntail}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -57,9 +57,9 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.wildfly.swarm</groupId>
+			<groupId>io.thorntail</groupId>
 			<artifactId>arquillian</artifactId>
-			<version>${version.wildfly.swarm}</version>
+			<version>${version.thorntail}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -73,9 +73,9 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.wildfly.swarm</groupId>
-				<artifactId>wildfly-swarm-plugin</artifactId>
-				<version>${version.wildfly.swarm}</version>
+				<groupId>io.thorntail</groupId>
+				<artifactId>thorntail-maven-plugin</artifactId>
+				<version>${version.thorntail}</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
index 936ccc633..55e464311 100644
--- a/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
+++ b/lib/taskana-cdi/src/test/java/pro/taskana/TaskanaProducersTest.java
@@ -15,8 +15,6 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.wildfly.swarm.Swarm;
-import org.wildfly.swarm.arquillian.CreateSwarm;
 import org.wildfly.swarm.undertow.WARArchive;
 
 /**
@@ -33,19 +31,13 @@ public class TaskanaProducersTest {
         deployment.addAllDependencies();
         deployment.addDependency("org.mybatis:mybatis:3.4.2");
         deployment.addDependency("org.mybatis:mybatis-cdi:1.0.0");
-        deployment.addDependency("pro.taskana:taskana-core:1.1.4-SNAPSHOT");
+        deployment.addDependency("pro.taskana:taskana-core");
         deployment.addAsResource("META-INF/beans.xml");
         deployment.addAsResource("taskana.properties");
         deployment.addAsResource("project-defaults.yml");
         return deployment;
     }
 
-    @CreateSwarm
-    public static Swarm newContainer() throws Exception {
-        Swarm swarm = new Swarm();
-        return swarm;
-    }
-
     @Test
     public void testCommit() throws SQLException, ClassNotFoundException {
 
diff --git a/pom.xml b/pom.xml
index cc9b03b48..63a346a21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
 
 		<!-- java ee dependencies -->
 		<version.resteasy>3.1.2.Final</version.resteasy>
-		<version.wildfly.swarm>2017.4.0</version.wildfly.swarm>
+		<version.thorntail>2.3.0.Final</version.thorntail>
 		<version.javaee-api>7.0</version.javaee-api>
 		<version.arquillian>1.1.10.Final</version.arquillian>
 
diff --git a/rest/taskana-rest-spring-wildfly-example/pom.xml b/rest/taskana-rest-spring-wildfly-example/pom.xml
index 04aebb97d..6c89cfd92 100644
--- a/rest/taskana-rest-spring-wildfly-example/pom.xml
+++ b/rest/taskana-rest-spring-wildfly-example/pom.xml
@@ -28,9 +28,9 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.wildfly.swarm</groupId>
+				<groupId>io.thorntail</groupId>
 				<artifactId>bom</artifactId>
-				<version>${version.wildfly.swarm}</version>
+				<version>${version.thorntail}</version>
 				<scope>import</scope>
 				<type>pom</type>
 			</dependency>
@@ -88,12 +88,12 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.wildfly.swarm</groupId>
+			<groupId>io.thorntail</groupId>
 			<artifactId>jaxrs</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.wildfly.swarm</groupId>
+			<groupId>io.thorntail</groupId>
 			<artifactId>cdi</artifactId>
 			<scope>test</scope>
 		</dependency>
@@ -105,7 +105,7 @@
 		</dependency>
 		<!-- Brought in via WildFly Swarm bom -->
 		<dependency>
-			<groupId>org.wildfly.swarm</groupId>
+			<groupId>io.thorntail</groupId>
 			<artifactId>arquillian</artifactId>
 			<scope>test</scope>
 		</dependency>