diff --git a/.github/actions/setup-release-env/action.yml b/.github/actions/setup-release-env/action.yml
index a7b08d70e23..54a52fafa9f 100644
--- a/.github/actions/setup-release-env/action.yml
+++ b/.github/actions/setup-release-env/action.yml
@@ -23,4 +23,4 @@ runs:
       shell: bash
       run: |
         git config user.name 'Lance Release Bot'
-        git config user.email 'lance-dev@lancedb.com'
+        git config user.email 'dev+gha@lance.org'
diff --git a/.github/workflows/java-publish.yml b/.github/workflows/java-publish.yml
index a22b8c2b910..320c3a910b2 100644
--- a/.github/workflows/java-publish.yml
+++ b/.github/workflows/java-publish.yml
@@ -217,7 +217,7 @@ jobs:
       - name: Set github
         run: |
           git config --global user.email "Lance Github Runner"
-          git config --global user.name "dev+gha@lancedb.com"
+          git config --global user.name "dev+gha@lance.org"
       - name: Dry run
         if: |
           github.event_name == 'pull_request' ||
diff --git a/Cargo.toml b/Cargo.toml
index f131f14d0b0..da4080278e5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,7 +27,7 @@ resolver = "2"
 [workspace.package]
 version = "0.40.0-beta.2"
 edition = "2021"
-authors = ["Lance Devs <dev@lancedb.com>"]
+authors = ["Lance Devs <dev@lance.org>"]
 license = "Apache-2.0"
 repository = "https://github.com/lancedb/lance"
 readme = "README.md"
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
index 17a28732d81..33b6be15bd5 100644
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -1,6 +1,6 @@
 site_name: Lance
 site_description: Open Lakehouse Format for Multimodal AI
-site_url: https://lancedb.github.io/lance/
+site_url: https://lance.org/
 docs_dir: src
 
 repo_name: lancedb/lance
diff --git a/docs/src/CNAME b/docs/src/CNAME
new file mode 100644
index 00000000000..ca944768b58
--- /dev/null
+++ b/docs/src/CNAME
@@ -0,0 +1 @@
+lance.org
\ No newline at end of file
diff --git a/java/lance-jni/Cargo.toml b/java/lance-jni/Cargo.toml
index 49342849e93..f3d77ea434a 100644
--- a/java/lance-jni/Cargo.toml
+++ b/java/lance-jni/Cargo.toml
@@ -2,7 +2,7 @@
 name = "lance-jni"
 version = "0.40.0-beta.2"
 edition = "2021"
-authors = ["Lance Devs <dev@lancedb.com>"]
+authors = ["Lance Devs <dev@lance.org>"]
 rust-version = "1.80"
 license = "Apache-2.0"
 repository = "https://github.com/lancedb/lance"
diff --git a/java/pom.xml b/java/pom.xml
index 4067f65ff75..5dcda5dd09c 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -16,7 +16,7 @@
     <developers>
         <developer>
             <name>Lance DB Dev Group</name>
-            <email>dev@lancedb.com</email>
+            <email>dev@lance.org</email>
         </developer>
     </developers>
     <licenses>
diff --git a/python/Cargo.toml b/python/Cargo.toml
index 5a591da4c54..0242f94f139 100644
--- a/python/Cargo.toml
+++ b/python/Cargo.toml
@@ -2,7 +2,7 @@
 name = "pylance"
 version = "0.40.0-beta.2"
 edition = "2021"
-authors = ["Lance Devs <dev@lancedb.com>"]
+authors = ["Lance Devs <dev@lance.org>"]
 rust-version = "1.80"
 exclude = ["python/lance/conftest.py"]
 publish = false
diff --git a/python/pyproject.toml b/python/pyproject.toml
index 180f7bdaf46..528f75a15ed 100644
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -3,7 +3,7 @@ name = "pylance"
 dynamic = ["version"]
 dependencies = ["pyarrow>=14", "numpy>=1.22", "lance_namespace>=0.0.20"]
 description = "python wrapper for Lance columnar format"
-authors = [{ name = "Lance Devs", email = "dev@lancedb.com" }]
+authors = [{ name = "Lance Devs", email = "dev@lance.org" }]
 license = { file = "LICENSE" }
 repository = "https://github.com/lancedb/lance"
 readme = "README.md"