diff --git a/java-serverhost/pom.xml b/java-serverhost/pom.xml
index 39e3a1c..da2c486 100644
--- a/java-serverhost/pom.xml
+++ b/java-serverhost/pom.xml
@@ -8,20 +8,36 @@
   <version>1.0</version>
   <packaging>war</packaging>
 
+
   <properties>
-    <version.wildfly.swarm>2017.10.0</version.wildfly.swarm>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <failOnMissingWebXml>false</failOnMissingWebXml>
+    <!-- Explicitly declaring the source encoding eliminates the following
+      message: -->
+    <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
+      resources, i.e. build is platform dependent! -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <failOnMissingWebXml>false</failOnMissingWebXml>
+
+    <!-- Thorntail dependency versions -->
+    <version.thorntail>2.4.0.Final</version.thorntail>
+
+    <!-- other plugin versions -->
+    <version.compiler.plugin>3.1</version.compiler.plugin>
+    <version.surefire.plugin>2.16</version.surefire.plugin>
+    <version.war.plugin>2.5</version.war.plugin>
+
+    <!-- maven-compiler-plugin -->
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+
   </properties>
 
+
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupId>io.thorntail</groupId>
         <artifactId>bom-all</artifactId>
-        <version>${version.wildfly.swarm}</version>
+        <version>${version.thorntail}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -32,9 +48,9 @@
     <finalName>java-serverhost</finalName>
     <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>
@@ -48,6 +64,14 @@
   </build>
 
   <dependencies>
+		<dependency>
+			<groupId>io.thorntail</groupId>
+			<artifactId>cdi</artifactId>
+		</dependency>
+    <dependency>
+      <groupId>io.thorntail</groupId>
+      <artifactId>jaxrs</artifactId>
+    </dependency>
     <!-- Java EE 7 dependency -->
     <dependency>
       <groupId>javax</groupId>