diff --git a/tck/docs/userguide/pom.xml b/tck/docs/userguide/pom.xml
index e2dc46d..f0b3244 100644
--- a/tck/docs/userguide/pom.xml
+++ b/tck/docs/userguide/pom.xml
@@ -23,13 +23,26 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.5</version>
+        <version>2.0.0-M1</version>
     </parent>
-    <groupId>org.glassfish</groupId>
-    <artifactId>tck_el</artifactId>
+
+    <groupId>jakarta.tck</groupId>
+    <artifactId>jakarta-expression-language-tck-userguide</artifactId>
+    <version>6.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <version>6.0.0</version>
-    <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Expression Language for Jakarta EE, Release 6.0</name>
+    
+    <name>Eclipse Foundation Technology Compatibility Kit User's Guide for Jakarta Expression Language for Jakarta EE, Release 6.1</name>
+
+    <!--
+        Override the license in the parent POM as TCKs all use the EFTL. 
+    -->
+    <licenses>
+        <license>
+            <name>Eclipse Foundation Technology Compatibility Kit License - v1.1</name>
+            <url>https://www.eclipse.org/legal/tck/</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,8 +55,9 @@
         <jbake.maven.plugin.version>2.7.0-rc.7</jbake.maven.plugin.version>
         <freemarker.version>2.3.30</freemarker.version>
         <!-- status: DRAFT, BETA, etc., or blank for final -->
-        <status></status>
+        <status>DRAFT</status>
         <doc.pdf>Expression-Language-TCK-Users-Guide.pdf</doc.pdf>
+        <!-- See also src/main/jbake/content/attributes.conf -->
         <maven.deploy.skip>true</maven.deploy.skip>
     </properties>
 
@@ -120,9 +134,6 @@
                 <artifactId>jbake-maven-plugin</artifactId>
                 <configuration>
                     <outputDirectory>${site.output.dir}</outputDirectory>
-                    <properties>
-                        <status>${status}</status>
-                    </properties>
                 </configuration>
                 <executions>
                     <execution>
@@ -141,10 +152,10 @@
                     <sourceDirectory>${project.build.directory}/book</sourceDirectory>
                     <sourceDocumentName>book.adoc</sourceDocumentName>
                     <!-- XXX - below depends on running jbake first -->
-                    <imagesDir>${project.build.directory}/staging/</imagesDir>
                     <backend>pdf</backend>
                     <outputFile>${doc.pdf}</outputFile>
                     <attributes>
+                        <imagesdir>${project.build.directory}/staging/</imagesdir>
                         <pdf-stylesdir>${project.basedir}/src/theme</pdf-stylesdir>
                         <pdf-style>jakartaee</pdf-style>
                         <doctype>book</doctype>
@@ -211,11 +222,6 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.3.0</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-scm-publish-plugin</artifactId>
                     <version>3.1.0</version>
                 </plugin>