diff --git a/distribution/feature-pack-builds/README.md b/distribution/feature-pack-builds/README.md
deleted file mode 100644
index fe4c55a49f..0000000000
--- a/distribution/feature-pack-builds/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Keycloak Feature Pack Builds
-============================
-
-The feature pack builds rely on WildFly Feature packs to create different combinations
-of Keycloak server/adapter and WildFly web/full.
-
-Types of Builds Created
---------------------
-The three directories under feature-pack-builds are _adapter-only_, _server-only_, and _server-and-adapter_.
-
-* **adapter-only** - A WildFly server with the Keycloak adapter subsystem added. This build is based on the WildFly Web Feature Pack. **keycloak-adapter-feature-pack** contains all the modules needed to run the Keycloak WildFly Adapter. Therefore, the build is _org.wildfly:wildfly-web-feature-pack_ + _org.keycloak:keycloak-adapter-feature-pack_.
-* **server-only** - A WildFly server with the Keycloak adapter subsystem added. This build is based on the WildFly Full Feature Pack. **keycloak-server-feature-pack** contains all the modules needed to run the Keycloak Server without those already provided by the full WildFly Server. Therefore, the build is _org.wildfly:wildfly-feature-pack_ + _org.keycloak:keycloak-server-feature-pack_.
-* **server-and-adapter** is the same thing as **server-only** except it also includes **keycloak-adapter-feature-pack**. Therefore, the build is _org.wildfly:wildfly-feature-pack_ + _org.keycloak:keycloak-server-feature-pack_ + _org.keycloak:keycloak-adapter-feature-pack_.
-
-Building
---------
-Each of the three types of builds in turn creates a build version and a dist version.
-
-The build version is a server that uses the new WildFly 9 feature whereby maven artifacts are not bundled with the server. Instead, they are looked up in a repository.
-
-For the dist version, these artifacts are copied into the server itself and no maven repo is required.
-
-By default, the dist version does not get built. To build it, specify the jboss-release profile:
-
-_mvn install -Pjboss-release_
diff --git a/distribution/feature-pack-builds/adapter-only/adapter-only-build/assembly.xml b/distribution/feature-pack-builds/adapter-only/adapter-only-build/assembly.xml
deleted file mode 100644
index 704449a131..0000000000
--- a/distribution/feature-pack-builds/adapter-only/adapter-only-build/assembly.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- thin-server
-
- zip
-
- false
-
-
- target
-
-
- ${project.build.finalName}/**
-
-
-
-
diff --git a/distribution/feature-pack-builds/adapter-only/adapter-only-build/pom.xml b/distribution/feature-pack-builds/adapter-only/adapter-only-build/pom.xml
deleted file mode 100644
index 179daf1405..0000000000
--- a/distribution/feature-pack-builds/adapter-only/adapter-only-build/pom.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
- org.keycloak
- adapter-only-builds
- 1.3.0.Final-SNAPSHOT
- ../pom.xml
-
- 4.0.0
-
- org.keycloak
- keycloak-adapter-only-build
-
- Keycloak WildFly Build: Adapter Only
- pom
-
-
-
- org.keycloak
- keycloak-adapter-feature-pack
- ${project.version}
- zip
-
-
-
-
-
-
- org.wildfly.build
- wildfly-server-provisioning-maven-plugin
-
-
- server-provisioning
-
- build
-
- compile
-
- server-provisioning.xml
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- assemble
- package
-
- single
-
-
-
- assembly.xml
-
- true
- ${project.build.finalName}
- false
- ${project.build.directory}
- ${project.build.directory}/assembly/work
- gnu
-
-
-
-
-
-
-
-
diff --git a/distribution/feature-pack-builds/adapter-only/adapter-only-build/server-provisioning.xml b/distribution/feature-pack-builds/adapter-only/adapter-only-build/server-provisioning.xml
deleted file mode 100644
index 13de0ef371..0000000000
--- a/distribution/feature-pack-builds/adapter-only/adapter-only-build/server-provisioning.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/distribution/feature-pack-builds/adapter-only/adapter-only-dist/assembly.xml b/distribution/feature-pack-builds/adapter-only/adapter-only-dist/assembly.xml
deleted file mode 100644
index 704449a131..0000000000
--- a/distribution/feature-pack-builds/adapter-only/adapter-only-dist/assembly.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- thin-server
-
- zip
-
- false
-
-
- target
-
-
- ${project.build.finalName}/**
-
-
-
-
diff --git a/distribution/feature-pack-builds/adapter-only/adapter-only-dist/pom.xml b/distribution/feature-pack-builds/adapter-only/adapter-only-dist/pom.xml
deleted file mode 100644
index a3cad64130..0000000000
--- a/distribution/feature-pack-builds/adapter-only/adapter-only-dist/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
- org.keycloak
- adapter-only-builds
- 1.3.0.Final-SNAPSHOT
- ../pom.xml
-
- 4.0.0
-
- org.keycloak
- keycloak-adapter-only-dist
-
- Keycloak WildFly Dist: Adapter Only
- pom
-
-
-
- org.keycloak
- keycloak-adapter-feature-pack
- ${project.version}
- zip
-
-
-
-
-
- jboss-release
-
-
-
- org.wildfly.build
- wildfly-server-provisioning-maven-plugin
-
-
- server-provisioning
-
- build
-
- compile
-
- server-provisioning.xml
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- assemble
- package
-
- single
-
-
-
- assembly.xml
-
- true
- ${project.build.finalName}
- false
- ${project.build.directory}
- ${project.build.directory}/assembly/work
- gnu
-
-
-
-
-
-
-
-
-
diff --git a/distribution/feature-pack-builds/adapter-only/adapter-only-dist/server-provisioning.xml b/distribution/feature-pack-builds/adapter-only/adapter-only-dist/server-provisioning.xml
deleted file mode 100644
index b9f46bc9eb..0000000000
--- a/distribution/feature-pack-builds/adapter-only/adapter-only-dist/server-provisioning.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/distribution/feature-pack-builds/adapter-only/pom.xml b/distribution/feature-pack-builds/adapter-only/pom.xml
deleted file mode 100644
index 74caef4e7d..0000000000
--- a/distribution/feature-pack-builds/adapter-only/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- feature-pack-builds
- org.keycloak
- 1.3.0.Final-SNAPSHOT
- ../pom.xml
-
- Adapter Only Builds
-
- 4.0.0
-
- adapter-only-builds
- pom
-
-
- adapter-feature-pack
- adapter-only-build
- adapter-only-dist
-
-
diff --git a/distribution/feature-pack-builds/pom.xml b/distribution/feature-pack-builds/pom.xml
deleted file mode 100644
index f5294418a7..0000000000
--- a/distribution/feature-pack-builds/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- distribution-pom
- org.keycloak
- 1.3.0.Final-SNAPSHOT
- ../pom.xml
-
- Feature Pack Builds
-
- 4.0.0
-
- feature-pack-builds
- pom
-
-
- adapter-only
- server-only
- server-and-adapter
-
-
diff --git a/distribution/feature-pack-builds/server-and-adapter/pom.xml b/distribution/feature-pack-builds/server-and-adapter/pom.xml
deleted file mode 100644
index ed6c704956..0000000000
--- a/distribution/feature-pack-builds/server-and-adapter/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
- feature-pack-builds
- org.keycloak
- 1.3.0.Final-SNAPSHOT
- ../pom.xml
-
- Builds with both server and adapter
-
- 4.0.0
-
- server-and-adapter
- pom
-
-
- server-and-adapter-build
- server-and-adapter-dist
-
-
diff --git a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-build/assembly.xml b/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-build/assembly.xml
deleted file mode 100644
index 704449a131..0000000000
--- a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-build/assembly.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- thin-server
-
- zip
-
- false
-
-
- target
-
-
- ${project.build.finalName}/**
-
-
-
-
diff --git a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-build/pom.xml b/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-build/pom.xml
deleted file mode 100644
index 774595eb6c..0000000000
--- a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-build/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
- org.keycloak
- server-and-adapter
- 1.3.0.Final-SNAPSHOT
- ../pom.xml
-
- 4.0.0
-
- org.keycloak
- keycloak-server-and-adapter-build
-
- Keycloak WildFly Build: Server and Adapter
- pom
-
-
-
- org.keycloak
- keycloak-server-feature-pack
- ${project.version}
- zip
-
-
- org.keycloak
- keycloak-adapter-feature-pack
- ${project.version}
- zip
-
-
-
-
-
-
- org.wildfly.build
- wildfly-server-provisioning-maven-plugin
-
-
- server-provisioning
-
- build
-
- compile
-
- server-provisioning.xml
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- assemble
- package
-
- single
-
-
-
- assembly.xml
-
- true
- ${project.build.finalName}
- false
- ${project.build.directory}
- ${project.build.directory}/assembly/work
- gnu
-
-
-
-
-
-
-
diff --git a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-build/server-provisioning.xml b/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-build/server-provisioning.xml
deleted file mode 100644
index f83f51720d..0000000000
--- a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-build/server-provisioning.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-dist/assembly.xml b/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-dist/assembly.xml
deleted file mode 100644
index 704449a131..0000000000
--- a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-dist/assembly.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- thin-server
-
- zip
-
- false
-
-
- target
-
-
- ${project.build.finalName}/**
-
-
-
-
diff --git a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-dist/pom.xml b/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-dist/pom.xml
deleted file mode 100644
index 1009ea3d4a..0000000000
--- a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-dist/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
- org.keycloak
- server-and-adapter
- 1.3.0.Final-SNAPSHOT
- ../pom.xml
-
- 4.0.0
-
- org.keycloak
- keycloak-server-and-adapter-dist
-
- Keycloak WildFly Dist: Server and Adapter
- pom
-
-
-
- org.keycloak
- keycloak-server-feature-pack
- ${project.version}
- zip
-
-
- org.keycloak
- keycloak-adapter-feature-pack
- ${project.version}
- zip
-
-
-
-
-
- jboss-release
-
-
-
- org.wildfly.build
- wildfly-server-provisioning-maven-plugin
-
-
- server-provisioning
-
- build
-
- compile
-
- server-provisioning.xml
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- assemble
- package
-
- single
-
-
-
- assembly.xml
-
- true
- ${project.build.finalName}
- false
- ${project.build.directory}
- ${project.build.directory}/assembly/work
- gnu
-
-
-
-
-
-
-
-
-
diff --git a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-dist/server-provisioning.xml b/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-dist/server-provisioning.xml
deleted file mode 100644
index 83253d7c56..0000000000
--- a/distribution/feature-pack-builds/server-and-adapter/server-and-adapter-dist/server-provisioning.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/distribution/feature-pack-builds/server-only/pom.xml b/distribution/feature-pack-builds/server-only/pom.xml
deleted file mode 100644
index 0dd99e6118..0000000000
--- a/distribution/feature-pack-builds/server-only/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
- feature-pack-builds
- org.keycloak
- 1.3.0.Final-SNAPSHOT
- ../pom.xml
-
- Server Only Builds
-
- 4.0.0
-
- server-only-builds
- pom
-
-
- server-feature-pack
- server-only-build
- server-only-dist
-
-
diff --git a/distribution/feature-pack-builds/server-only/server-only-build/assembly.xml b/distribution/feature-pack-builds/server-only/server-only-build/assembly.xml
deleted file mode 100644
index 704449a131..0000000000
--- a/distribution/feature-pack-builds/server-only/server-only-build/assembly.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- thin-server
-
- zip
-
- false
-
-
- target
-
-
- ${project.build.finalName}/**
-
-
-
-
diff --git a/distribution/feature-pack-builds/server-only/server-only-build/pom.xml b/distribution/feature-pack-builds/server-only/server-only-build/pom.xml
deleted file mode 100644
index f496a3de3a..0000000000
--- a/distribution/feature-pack-builds/server-only/server-only-build/pom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
- org.keycloak
- server-only-builds
- 1.3.0.Final-SNAPSHOT
- ../pom.xml
-
- 4.0.0
-
- org.keycloak
- keycloak-server-only-build
-
- Keycloak WildFly Build: Server Only
- pom
-
-
-
- org.keycloak
- keycloak-server-feature-pack
- ${project.version}
- zip
-
-
-
-
-
-
- org.wildfly.build
- wildfly-server-provisioning-maven-plugin
-
-
- server-provisioning
-
- build
-
- compile
-
- server-provisioning.xml
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- assemble
- package
-
- single
-
-
-
- assembly.xml
-
- true
- ${project.build.finalName}
- false
- ${project.build.directory}
- ${project.build.directory}/assembly/work
- gnu
-
-
-
-
-
-
-
diff --git a/distribution/feature-pack-builds/server-only/server-only-build/server-provisioning.xml b/distribution/feature-pack-builds/server-only/server-only-build/server-provisioning.xml
deleted file mode 100644
index 9e4b4f368f..0000000000
--- a/distribution/feature-pack-builds/server-only/server-only-build/server-provisioning.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/distribution/feature-pack-builds/server-only/server-only-dist/assembly.xml b/distribution/feature-pack-builds/server-only/server-only-dist/assembly.xml
deleted file mode 100644
index 1d7cc51697..0000000000
--- a/distribution/feature-pack-builds/server-only/server-only-dist/assembly.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
- full-server
-
- zip
-
- false
-
-
- target
-
-
- ${project.build.finalName}/**
-
-
-
-
diff --git a/distribution/feature-pack-builds/server-only/server-only-dist/pom.xml b/distribution/feature-pack-builds/server-only/server-only-dist/pom.xml
deleted file mode 100644
index ab7c51a08f..0000000000
--- a/distribution/feature-pack-builds/server-only/server-only-dist/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
- org.keycloak
- server-only-builds
- 1.3.0.Final-SNAPSHOT
- ../pom.xml
-
- 4.0.0
-
- org.keycloak
- keycloak-server-only-dist
-
- Keycloak WildFly Dist: Server Only
- pom
-
-
-
- org.keycloak
- keycloak-server-feature-pack
- ${project.version}
- zip
-
-
-
-
-
- jboss-release
-
-
-
- org.wildfly.build
- wildfly-server-provisioning-maven-plugin
-
-
- server-provisioning
-
- build
-
- compile
-
- server-provisioning.xml
-
-
-
-
-
- org.apache.maven.plugins
- maven-assembly-plugin
-
-
- assemble
- package
-
- single
-
-
-
- assembly.xml
-
- true
- ${project.build.finalName}
- false
- ${project.build.directory}
- ${project.build.directory}/assembly/work
- gnu
-
-
-
-
-
-
-
-
-
diff --git a/distribution/feature-pack-builds/server-only/server-only-dist/server-provisioning.xml b/distribution/feature-pack-builds/server-only/server-only-dist/server-provisioning.xml
deleted file mode 100644
index d414b952a0..0000000000
--- a/distribution/feature-pack-builds/server-only/server-only-dist/server-provisioning.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file