diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml
index 55c93f10f13..2cd50708b6d 100644
--- a/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml
+++ b/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml
@@ -23,8 +23,8 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>${galleon-adapter-group-id}</groupId>
+    
+    <groupId>org.keycloak</groupId>
     <artifactId>keycloak-adapter-galleon-pack</artifactId>
 
     <name>Keycloak Galleon Feature Pack: Adapter</name>
diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml
index b8ab9f23859..dbe46741867 100644
--- a/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml
+++ b/distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml
@@ -14,22 +14,8 @@
   ~ limitations under the License.
   -->
 
-<build xmlns="urn:wildfly:feature-pack-build:3.0" producer="org.jboss.sso:keycloak-adapter-galleon-pack">
+<build xmlns="urn:wildfly:feature-pack-build:3.1" producer="org.keycloak:keycloak-adapter-galleon-pack">
     <transitive>
-        <dependency group-id="org.wildfly.core" artifact-id="wildfly-core-galleon-pack">
-            <name>org.wildfly.core:wildfly-core-galleon-pack</name>
-            <packages inherit="false">
-                <exclude name="product.conf"/>
-            </packages>
-            <default-configs inherit="false"/>
-        </dependency>
-        <dependency group-id="org.jboss.eap" artifact-id="wildfly-servlet-galleon-pack">
-            <name>org.jboss.eap:wildfly-servlet-galleon-pack</name>
-            <packages inherit="false">
-                <exclude name="product.conf"/>
-            </packages>
-            <default-configs inherit="false"/>
-        </dependency>
         <dependency group-id="org.jboss.eap" artifact-id="wildfly-ee-galleon-pack">
             <name>org.jboss.eap:wildfly-ee-galleon-pack</name>
             <packages inherit="false">
@@ -39,8 +25,8 @@
         </dependency>
     </transitive>
     <dependencies>
-        <dependency group-id="org.jboss.eap" artifact-id="wildfly-galleon-pack">
-            <name>org.jboss.eap:wildfly-galleon-pack</name>
+        <dependency group-id="org.jboss.eap" artifact-id="wildfly-ee-galleon-pack">
+            <name>org.jboss.eap:wildfly-ee-galleon-pack</name>
             <packages inherit="false">
                  <exclude name="product.conf"/>
             </packages>