diff --git a/ejb-remote/client/pom.xml b/ejb-remote/client/pom.xml
index 06f368b28c..088119b003 100644
--- a/ejb-remote/client/pom.xml
+++ b/ejb-remote/client/pom.xml
@@ -52,7 +52,6 @@
             <groupId>org.jboss.modules</groupId>
             <artifactId>jboss-modules</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>
diff --git a/ejb-remote/client/src/main/resources/META-INF/wildfly-config.xml b/ejb-remote/client/src/main/resources/META-INF/wildfly-config.xml
new file mode 100644
index 0000000000..f7b1f40e37
--- /dev/null
+++ b/ejb-remote/client/src/main/resources/META-INF/wildfly-config.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2016 Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<configuration>
+    <authentication-client xmlns="urn:elytron:1.0">
+        <authentication-rules>
+                    <rule use-configuration="default" />
+        </authentication-rules>
+        <authentication-configurations>
+            <configuration name="default">
+                <allow-all-sasl-mechanisms />
+                <set-mechanism-properties>
+                    <property key="wildfly.sasl.local-user.quiet-auth" value="true" />
+                 </set-mechanism-properties>
+                 <use-service-loader-providers />
+             </configuration>
+        </authentication-configurations>
+    </authentication-client>
+</configuration>
diff --git a/helloworld-jms/pom.xml b/helloworld-jms/pom.xml
index 7120f8020e..eadfc7cad1 100644
--- a/helloworld-jms/pom.xml
+++ b/helloworld-jms/pom.xml
@@ -37,12 +37,14 @@
         </license>
     </licenses>
 
+
     <dependencies>
         <dependency>
             <groupId>org.wildfly</groupId>
             <artifactId>wildfly-jms-client-bom</artifactId>
             <type>pom</type>
         </dependency>
+        
     </dependencies>
 
     <build>
diff --git a/helloworld-jms/src/main/resources/META-INF/wildfly-config.xml b/helloworld-jms/src/main/resources/META-INF/wildfly-config.xml
new file mode 100644
index 0000000000..f7b1f40e37
--- /dev/null
+++ b/helloworld-jms/src/main/resources/META-INF/wildfly-config.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2016 Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<configuration>
+    <authentication-client xmlns="urn:elytron:1.0">
+        <authentication-rules>
+                    <rule use-configuration="default" />
+        </authentication-rules>
+        <authentication-configurations>
+            <configuration name="default">
+                <allow-all-sasl-mechanisms />
+                <set-mechanism-properties>
+                    <property key="wildfly.sasl.local-user.quiet-auth" value="true" />
+                 </set-mechanism-properties>
+                 <use-service-loader-providers />
+             </configuration>
+        </authentication-configurations>
+    </authentication-client>
+</configuration>
diff --git a/pom.xml b/pom.xml
index c050c8ea39..1a77d4b400 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,17 +56,13 @@
             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>
-
+ 
         <version.spring.framework>4.3.6.RELEASE</version.spring.framework>
-        <!-- EAP component version management BOM -->
-        <version.server.bom>11.0.0.Alpha1</version.server.bom>
-        
-        <version.jboss.spec.javaee.7.0>1.1.0.Beta1</version.jboss.spec.javaee.7.0>
+         <!-- EAP component version management BOM -->
 
-        <!-- maven-compiler-plugin -->
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
-
+ 
         <version.jaxws-tools-maven-plugin>1.2.0.Final</version.jaxws-tools-maven-plugin>
 
         <!-- Other dependency versions -->