diff --git a/antora-playbook.yml b/antora-playbook.yml
index 9bd73fa..f0170cb 100644
--- a/antora-playbook.yml
+++ b/antora-playbook.yml
@@ -6,7 +6,7 @@ site:
 content:
   # branches will be updated when PRs are merged
   sources:
-  - url: https://github.com/virtua-tech/jakartaee-tutorial.git
+  - url: https://github.com/jakartaee/jakartaee-tutorial.git
     start_paths:
       - src/main/antora
     branches:
@@ -17,8 +17,9 @@ urls:
   latest_version_segment: current
 
 ui:
+  output_dir: _
   bundle:
-    url: https://github.com/virtua-tech/jakartaee-tutorial-ui/releases/download/latest/ui-bundle.zip
+    url: https://github.com/jakartaee/jakartaee-documentation-ui/releases/download/latest/ui-bundle.zip
     snapshot: true
 
 runtime:
diff --git a/pom.xml b/pom.xml
index e50c3fc..0910a1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>jakarta.docs</groupId>
-    <artifactId>docs-site</artifactId>
+    <artifactId>jakartaee-documentation</artifactId>
     <packaging>pom</packaging>
     <!-- This version does not need to correspond to the Jakarta EE version, since the core Jakarta EE docs are in a different repo -->
     <version>10</version>