diff --git a/README.md b/README.md
index 629eb526..30ab3042 100644
--- a/README.md
+++ b/README.md
@@ -134,6 +134,10 @@ artifacts, which is done by enabling the `ts.wildfly.target-distribution.eap` or
 mvn test -pl testsuite/ -Pts.execution-profile.prod -Pts.wildfly.target-distribution.eap
 ```
 
+Regarding the EAP XP version, Intersmash supports provisioning both XP 5 and XP 6, and the deployments used by the 
+Intersmash testsuite can be built by using related artifacts and feature packs by enabling either the `ts.wildfly.eapxp.stream.xp6`, 
+or the `ts.wildfly.eapxp.stream.xp5` profile.
+
 * Run Kubernetes integration tests:
 ```shell
 mvn test -pl testsuite/ -Pts.execution-profile.community -Pts.k8s 
diff --git a/testsuite/deployments/wildfly-shared/pom.xml b/testsuite/deployments/wildfly-shared/pom.xml
index bfeab505..337f29e9 100644
--- a/testsuite/deployments/wildfly-shared/pom.xml
+++ b/testsuite/deployments/wildfly-shared/pom.xml
@@ -47,6 +47,13 @@
             the productized version
         -->
         <version.wildfly-jar-maven-plugin>12.0.0.Beta1</version.wildfly-jar-maven-plugin>
+        <!-- EE Channel coordinates -->
+        <wildfly.ee-channel.groupId></wildfly.ee-channel.groupId>
+        <wildfly.ee-channel.artifactId></wildfly.ee-channel.artifactId>
+        <wildfly.ee-channel.version></wildfly.ee-channel.version>
+        <wildfly.xp-channel.groupId></wildfly.xp-channel.groupId>
+        <wildfly.xp-channel.artifactId></wildfly.xp-channel.artifactId>
+        <wildfly.xp-channel.version></wildfly.xp-channel.version>
     </properties>
 
     <modules>
@@ -260,30 +267,62 @@
             </build>
         </profile>
 
+
         <profile>
-            <!-- Configuration settings for testing EAP XP -->
-            <id>ts.wildfly.target-distribution.eapxp</id>
+            <!-- Configuration settings for testing EAP XP 6 (same as XP 5 ATM) - TODO: update as XP 6 deliverables are GA -->
+            <id>ts.wildfly.eapxp.stream.xp6</id>
             <properties>
-                <!-- WildFly/EAP 8 Maven Plugin coordinates -->
+                <!-- WildFly/EAP 8.1 Maven Plugin coordinates -->
                 <wildfly-maven-plugin.groupId>org.jboss.eap.plugins</wildfly-maven-plugin.groupId>
                 <wildfly-maven-plugin.artifactId>eap-maven-plugin</wildfly-maven-plugin.artifactId>
                 <wildfly-maven-plugin.version>1.0.0.Final-redhat-00014</wildfly-maven-plugin.version>
-                <!-- Default EAP XP `microprofile` BOM version is set here and can be overridden for pulling the right BOM -->
+                <!-- Default EAP XP 6 `microprofile` BOM version is set here and can be overridden for pulling the right BOM -->
                 <bom.wildfly-microprofile.groupId>org.jboss.bom</bom.wildfly-microprofile.groupId>
                 <bom.wildfly-microprofile.artifactId>jboss-eap-xp-microprofile</bom.wildfly-microprofile.artifactId>
                 <bom.wildfly-microprofile.version>5.0.0.GA-redhat-00009</bom.wildfly-microprofile.version>
-                <!-- EAP 8 Channel coordinates -->
+                <!-- EAP 8.1 Channel coordinates -->
                 <wildfly.ee-channel.groupId>org.jboss.eap.channels</wildfly.ee-channel.groupId>
                 <wildfly.ee-channel.artifactId>eap-8.0</wildfly.ee-channel.artifactId>
                 <wildfly.ee-channel.version>1.0.1.GA-redhat-00003</wildfly.ee-channel.version>
-                <!-- EAP XP Channel coordinates -->
+                <!-- EAP XP 6 Channel coordinates -->
                 <wildfly.xp-channel.groupId>org.jboss.eap.channels</wildfly.xp-channel.groupId>
                 <wildfly.xp-channel.artifactId>eap-xp-5.0</wildfly.xp-channel.artifactId>
                 <wildfly.xp-channel.version>1.0.0.GA-redhat-00006</wildfly.xp-channel.version>
-                <!-- WildFly FPL -->
+                <!-- FPLs -->
                 <wildfly.feature-pack.location>org.jboss.eap.xp:wildfly-galleon-pack:5.0.0.GA-redhat-00005</wildfly.feature-pack.location>
                 <wildfly.cloud-feature-pack.location>org.jboss.eap.cloud:eap-cloud-galleon-pack:1.0.0.Final-redhat-00008</wildfly.cloud-feature-pack.location>
             </properties>
+        </profile>
+
+        <profile>
+            <!-- Configuration settings for testing EAP XP 5 -->
+            <id>ts.wildfly.eapxp.stream.xp5</id>
+            <properties>
+                <!-- WildFly/EAP 8.0 Maven Plugin coordinates -->
+                <wildfly-maven-plugin.groupId>org.jboss.eap.plugins</wildfly-maven-plugin.groupId>
+                <wildfly-maven-plugin.artifactId>eap-maven-plugin</wildfly-maven-plugin.artifactId>
+                <wildfly-maven-plugin.version>1.0.0.Final-redhat-00014</wildfly-maven-plugin.version>
+                <!-- Default EAP XP 5 `microprofile` BOM version is set here and can be overridden for pulling the right BOM -->
+                <bom.wildfly-microprofile.groupId>org.jboss.bom</bom.wildfly-microprofile.groupId>
+                <bom.wildfly-microprofile.artifactId>jboss-eap-xp-microprofile</bom.wildfly-microprofile.artifactId>
+                <bom.wildfly-microprofile.version>5.0.0.GA-redhat-00009</bom.wildfly-microprofile.version>
+                <!-- EAP 8.0 Channel coordinates -->
+                <wildfly.ee-channel.groupId>org.jboss.eap.channels</wildfly.ee-channel.groupId>
+                <wildfly.ee-channel.artifactId>eap-8.0</wildfly.ee-channel.artifactId>
+                <wildfly.ee-channel.version>1.0.1.GA-redhat-00003</wildfly.ee-channel.version>
+                <!-- EAP XP 5 Channel coordinates -->
+                <wildfly.xp-channel.groupId>org.jboss.eap.channels</wildfly.xp-channel.groupId>
+                <wildfly.xp-channel.artifactId>eap-xp-5.0</wildfly.xp-channel.artifactId>
+                <wildfly.xp-channel.version>1.0.0.GA-redhat-00006</wildfly.xp-channel.version>
+                <!-- FPLs -->
+                <wildfly.feature-pack.location>org.jboss.eap.xp:wildfly-galleon-pack:5.0.0.GA-redhat-00005</wildfly.feature-pack.location>
+                <wildfly.cloud-feature-pack.location>org.jboss.eap.cloud:eap-cloud-galleon-pack:1.0.0.Final-redhat-00008</wildfly.cloud-feature-pack.location>
+            </properties>
+        </profile>
+
+        <profile>
+            <!-- Configuration settings for testing EAP XP -->
+            <id>ts.wildfly.target-distribution.eapxp</id>
             <build>
                 <pluginManagement>
                     <plugins>