diff --git a/on-wildfly10/Dockerfile b/on-wildfly10/Dockerfile
new file mode 100644
index 0000000..30fa79e
--- /dev/null
+++ b/on-wildfly10/Dockerfile
@@ -0,0 +1,12 @@
+# Use Wildfly 9 image as the base
+FROM jboss/wildfly:10.0.0.Final
+
+MAINTAINER Eric Wittmann <eric.wittmann@redhat.com>
+
+ENV APIMAN_VERSION 1.2.2.Final
+
+RUN cd $HOME/wildfly \
+ && curl http://downloads.jboss.org/apiman/$APIMAN_VERSION/apiman-distro-wildfly10-$APIMAN_VERSION-overlay.zip | bsdtar -xvf-
+
+# Set the default command to run on boot
+ENTRYPOINT ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0", "-c", "standalone-apiman.xml"]
diff --git a/on-wildfly10/README.md b/on-wildfly10/README.md
new file mode 100644
index 0000000..bec1852
--- /dev/null
+++ b/on-wildfly10/README.md
@@ -0,0 +1,39 @@
+apiman on wildfly 10
+===================
+
+## Usage
+
+To start up apiman
+
+    docker run -it apiman/on-wildfly10
+
+You may want to map the port(s) so you can access the app
+
+    docker run -it -p 8080:8080 -p 8443:8443 apiman/on-wildfly10
+
+## Building the image
+
+    docker build -t="apiman/on-wildfly10" --rm .
+
+## Image accessible on Docker hub
+
+This image is automatically built and published into [Docker Hub](https://registry.hub.docker.com/u/apiman/on-wildfly10/).
+
+
+## How to extend the image
+
+You might probably want to extend the image. Usually creating/enabling admin user for wildfly is a good practice, and also, if you want to debug the apiman, you can enable debugging, and expose the debug port like so:
+
+    FROM apiman/on-wildfly10
+    RUN $JBOSS_HOME/bin/add-user.sh admin admin123! --silent
+    EXPOSE 8787
+    CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0", "-bmanagement", "0.0.0.0", "-c", "standalone-apiman.xml", "--debug"]
+
+You can build your own extended image with:
+
+    docker build --rm -t "myname/apiman-on-wildfly10:latest" .
+
+And then run it like:
+
+    docker run -it --rm -p 8080:8080 -p 9990:9990 -p 8787:8787 myname/apiman-on-wildfly10
+    
diff --git a/on-wildfly8/Dockerfile b/on-wildfly8/Dockerfile
index 1119ab2..9790aa0 100644
--- a/on-wildfly8/Dockerfile
+++ b/on-wildfly8/Dockerfile
@@ -3,7 +3,7 @@ FROM jboss/wildfly:8.2.1.Final
 
 MAINTAINER Eric Wittmann <eric.wittmann@redhat.com>
 
-ENV APIMAN_VERSION 1.2.1.Final
+ENV APIMAN_VERSION 1.2.2.Final
 
 RUN cd $HOME/wildfly \
  && curl http://downloads.jboss.org/apiman/$APIMAN_VERSION/apiman-distro-wildfly8-$APIMAN_VERSION-overlay.zip | bsdtar -xvf-
diff --git a/on-wildfly9/Dockerfile b/on-wildfly9/Dockerfile
index aecf3ad..d0dbb9f 100644
--- a/on-wildfly9/Dockerfile
+++ b/on-wildfly9/Dockerfile
@@ -3,7 +3,7 @@ FROM jboss/wildfly:9.0.2.Final
 
 MAINTAINER Eric Wittmann <eric.wittmann@redhat.com>
 
-ENV APIMAN_VERSION 1.2.1.Final
+ENV APIMAN_VERSION 1.2.2.Final
 
 RUN cd $HOME/wildfly \
  && curl http://downloads.jboss.org/apiman/$APIMAN_VERSION/apiman-distro-wildfly9-$APIMAN_VERSION-overlay.zip | bsdtar -xvf-