diff --git a/README.md b/README.md
index 7b49084..d1b44d9 100644
--- a/README.md
+++ b/README.md
@@ -57,9 +57,9 @@ The following steps can be used to configure and run the demo in a docker contai
 5. Start demo container
 
 	```
-	docker run --it -p 8080:8080 -p 9990:9990 jbossdemocentral/bpms-install-demo
+	docker run -it -p 8080:8080 -p 9990:9990 jbossdemocentral/bpms-install-demo
 	```
-6. Login to http://<DOCKER_HOST>:8080/business-central (u:erics / p:bpmsuite1!)
+6. Login to http://&lt;DOCKER_HOST&gt;:8080/business-central (u:erics / p:bpmsuite1!)
 
 7. Enjoy installed and configured JBoss BPM Suite.
 
diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
index 47a3c91..45e2ba4 100644
--- a/support/docker/Dockerfile
+++ b/support/docker/Dockerfile
@@ -5,27 +5,40 @@ FROM jbossdemocentral/developer
 MAINTAINER Andrew Block <andy.block@gmail.com>
 
 # Environment Variables 
-ENV BPMS_HOME /opt/jboss/bpms
+ENV BPMS_HOME /opt/jboss/bpms/jboss-eap-6.4
 ENV BPMS_VERSION_MAJOR 6
-ENV BPMS_VERSION_MINOR 0
-ENV BPMS_VERSION_MICRO 3
+ENV BPMS_VERSION_MINOR 1
+ENV BPMS_VERSION_MICRO 0
+ENV BPMS_VERSION_BUILD GA
+
+ENV EAP_VERSION_MAJOR 6
+ENV EAP_VERSION_MINOR 4
+ENV EAP_VERSION_MICRO 0
 
 # ADD Installation Files
-COPY support/installation-bpms support/installation-bpms.variables installs/jboss-bpms-installer-$BPMS_VERSION_MAJOR.$BPMS_VERSION_MINOR.$BPMS_VERSION_MICRO.GA-redhat-1.jar  /opt/jboss/
+COPY support/installation-bpms support/installation-eap support/installation-bpms.variables support/installation-eap.variables installs/jboss-bpmsuite-$BPMS_VERSION_MAJOR.$BPMS_VERSION_MINOR.$BPMS_VERSION_MICRO.$BPMS_VERSION_BUILD-installer.jar installs/jboss-eap-$EAP_VERSION_MAJOR.$EAP_VERSION_MINOR.$EAP_VERSION_MICRO-installer.jar  /opt/jboss/
+
+# Update Permissions on Installers
+USER root
+RUN chown jboss:jboss /opt/jboss/jboss-eap-$EAP_VERSION_MAJOR.$EAP_VERSION_MINOR.$EAP_VERSION_MICRO-installer.jar /opt/jboss/jboss-bpmsuite-$BPMS_VERSION_MAJOR.$BPMS_VERSION_MINOR.$BPMS_VERSION_MICRO.$BPMS_VERSION_BUILD-installer.jar 
+USER jboss
 
 # Prepare and run installer and cleanup installation components
-RUN sed -i "s:<installpath>.*</installpath>:<installpath>$BPMS_HOME</installpath>:" /opt/jboss/installation-bpms \
-	&& java -jar /opt/jboss/jboss-bpms-installer-$BPMS_VERSION_MAJOR.$BPMS_VERSION_MINOR.$BPMS_VERSION_MICRO.GA-redhat-1.jar  /opt/jboss/installation-bpms -variablefile /opt/jboss/installation-bpms.variables \
-	&& rm -rf /opt/jboss/jboss-bpms-installer-$BPMS_VERSION_MAJOR.$BPMS_VERSION_MINOR.$BPMS_VERSION_MICRO.GA-redhat-1.jar /opt/jboss/installation-bpms /opt/jboss/installation-bpms.variables $BPMS_HOME/jboss-eap-6.1/standalone/configuration/standalone_xml_history/
+RUN sed -i "s:<installpath>.*</installpath>:<installpath>$BPMS_HOME</installpath>:" /opt/jboss/installation-eap \
+    && sed -i "s:<installpath>.*</installpath>:<installpath>$BPMS_HOME</installpath>:" /opt/jboss/installation-bpms \
+	&& java -jar /opt/jboss/jboss-eap-$EAP_VERSION_MAJOR.$EAP_VERSION_MINOR.$EAP_VERSION_MICRO-installer.jar  /opt/jboss/installation-eap -variablefile /opt/jboss/installation-eap.variables \
+	&& java -jar /opt/jboss/jboss-bpmsuite-$BPMS_VERSION_MAJOR.$BPMS_VERSION_MINOR.$BPMS_VERSION_MICRO.$BPMS_VERSION_BUILD-installer.jar  /opt/jboss/installation-bpms -variablefile /opt/jboss/installation-bpms.variables \
+	&& rm -rf /opt/jboss/jboss-bpmsuite-$BPMS_VERSION_MAJOR.$BPMS_VERSION_MINOR.$BPMS_VERSION_MICRO.$BPMS_VERSION_BUILD-installer.jar /opt/jboss/jboss-eap-$EAP_VERSION_MAJOR.$EAP_VERSION_MINOR.$EAP_VERSION_MICRO-installer.jar /opt/jboss/installation-bpms /opt/jboss/installation-bpms.variables /opt/jboss/installation-eap /opt/jboss/installation-eap.variables $BPMS_HOME/standalone/configuration/standalone_xml_history/
 
 # Add support files
-COPY support/application-roles.properties support/standalone.xml $BPMS_HOME/jboss-eap-6.1/standalone/configuration/
+COPY support/application-roles.properties support/standalone.xml $BPMS_HOME/standalone/configuration/
+COPY support/userinfo.properties $BPMS_HOME/standalone/deployments/business-central.war/WEB-INF/classes/
 
 # Swtich back to root user to perform cleanup
 USER root
 
 # Fix permissions on support files
-RUN chown -R jboss:jboss $BPMS_HOME/jboss-eap-6.1/standalone/configuration/standalone.xml
+RUN chown -R jboss:jboss $BPMS_HOME/standalone/configuration/standalone.xml $BPMS_HOME/standalone/deployments/business-central.war/WEB-INF/classes/userinfo.properties 
 
 # Run as JBoss 
 USER jboss
@@ -34,4 +47,4 @@ USER jboss
 EXPOSE 9990 9999 8080
 
 # Run BPMS
-CMD ["/opt/jboss/bpms/jboss-eap-6.1/bin/standalone.sh","-c","standalone.xml","-b", "0.0.0.0","-bmanagement","0.0.0.0"]
+CMD ["/opt/jboss/bpms/jboss-eap-6.4/bin/standalone.sh","-c","standalone.xml","-b", "0.0.0.0","-bmanagement","0.0.0.0"]