diff --git a/.github/workflows/gen_fedora36.yml b/.github/workflows/gen_fedora39.yml
similarity index 91%
rename from .github/workflows/gen_fedora36.yml
rename to .github/workflows/gen_fedora39.yml
index 342a185521c..f8a245ac798 100644
--- a/.github/workflows/gen_fedora36.yml
+++ b/.github/workflows/gen_fedora39.yml
@@ -1,4 +1,4 @@
-name: fedora36
+name: fedora39
 
 on:
   pull_request:
@@ -8,7 +8,7 @@ on:
       - "**/*.rs"
       - "**/Cargo.lock"
       - "**/Cargo.toml"
-      - ".github/workflows/gen_fedora36.yml"
+      - ".github/workflows/gen_fedora39.yml"
       - "assets/fonts/**/*"
       - "assets/icon/*"
       - "assets/open-wezterm-here"
@@ -25,7 +25,7 @@ on:
 jobs:
   build:
     runs-on: "ubuntu-latest"
-    container: "fedora:36"
+    container: "fedora:39"
 
     steps:
       - name: "Install config manager"
@@ -55,7 +55,7 @@ jobs:
       - name: "Cache cargo"
         uses: Swatinem/rust-cache@v2
         with:
-          key: "fedora36-None-2-${{ runner.os }}-cargo"
+          key: "fedora39-None-2-${{ runner.os }}-cargo"
       - name: "Install System Deps"
         shell: bash
         run: "env CI=yes PATH=$PATH ./get-deps"
@@ -66,7 +66,7 @@ jobs:
         uses: baptiste0928/cargo-install@v2
         with:
           crate: "cargo-nextest"
-          cache-key: "fedora36"
+          cache-key: "fedora39"
       - name: "Test (Release mode)"
         shell: bash
         run: "cargo nextest run --all --release --no-fail-fast"
@@ -79,5 +79,5 @@ jobs:
       - name: "Upload artifact"
         uses: actions/upload-artifact@v3
         with:
-          name: "fedora36"
+          name: "fedora39"
           path: "wezterm-*.rpm"
diff --git a/.github/workflows/gen_fedora36_continuous.yml b/.github/workflows/gen_fedora39_continuous.yml
similarity index 92%
rename from .github/workflows/gen_fedora36_continuous.yml
rename to .github/workflows/gen_fedora39_continuous.yml
index d3655cb88db..f84c017dded 100644
--- a/.github/workflows/gen_fedora36_continuous.yml
+++ b/.github/workflows/gen_fedora39_continuous.yml
@@ -1,4 +1,4 @@
-name: fedora36_continuous
+name: fedora39_continuous
 
 on:
   schedule:
@@ -10,7 +10,7 @@ on:
       - "**/*.rs"
       - "**/Cargo.lock"
       - "**/Cargo.toml"
-      - ".github/workflows/gen_fedora36_continuous.yml"
+      - ".github/workflows/gen_fedora39_continuous.yml"
       - "assets/fonts/**/*"
       - "assets/icon/*"
       - "assets/open-wezterm-here"
@@ -27,7 +27,7 @@ on:
 jobs:
   build:
     runs-on: "ubuntu-latest"
-    container: "fedora:36"
+    container: "fedora:39"
     env:
       BUILD_REASON: "Schedule"
 
@@ -59,7 +59,7 @@ jobs:
       - name: "Cache cargo"
         uses: Swatinem/rust-cache@v2
         with:
-          key: "fedora36-None-2-${{ runner.os }}-cargo"
+          key: "fedora39-None-2-${{ runner.os }}-cargo"
       - name: "Install System Deps"
         shell: bash
         run: "env CI=yes PATH=$PATH ./get-deps"
@@ -70,7 +70,7 @@ jobs:
         uses: baptiste0928/cargo-install@v2
         with:
           crate: "cargo-nextest"
-          cache-key: "fedora36"
+          cache-key: "fedora39"
       - name: "Test (Release mode)"
         shell: bash
         run: "cargo nextest run --all --release --no-fail-fast"
@@ -79,11 +79,11 @@ jobs:
         run: "bash ci/deploy.sh"
       - name: "Move RPM"
         shell: bash
-        run: "mv ~/rpmbuild/RPMS/*/*.rpm wezterm-nightly-fedora36.rpm"
+        run: "mv ~/rpmbuild/RPMS/*/*.rpm wezterm-nightly-fedora39.rpm"
       - name: "Upload artifact"
         uses: actions/upload-artifact@v3
         with:
-          name: "fedora36"
+          name: "fedora39"
           path: "wezterm-*.rpm"
           retention-days: 5
 
@@ -100,7 +100,7 @@ jobs:
       - name: "Download artifact"
         uses: actions/download-artifact@v3
         with:
-          name: "fedora36"
+          name: "fedora39"
       - name: "Checksum"
         shell: bash
         run: "for f in wezterm-*.rpm ; do sha256sum $f > $f.sha256 ; done"
diff --git a/.github/workflows/gen_fedora36_tag.yml b/.github/workflows/gen_fedora39_tag.yml
similarity index 93%
rename from .github/workflows/gen_fedora36_tag.yml
rename to .github/workflows/gen_fedora39_tag.yml
index 056eaaf857f..cd11f7ccd07 100644
--- a/.github/workflows/gen_fedora36_tag.yml
+++ b/.github/workflows/gen_fedora39_tag.yml
@@ -1,4 +1,4 @@
-name: fedora36_tag
+name: fedora39_tag
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 jobs:
   build:
     runs-on: "ubuntu-latest"
-    container: "fedora:36"
+    container: "fedora:39"
 
     steps:
       - name: "Install config manager"
@@ -38,7 +38,7 @@ jobs:
       - name: "Cache cargo"
         uses: Swatinem/rust-cache@v2
         with:
-          key: "fedora36-None-2-${{ runner.os }}-cargo"
+          key: "fedora39-None-2-${{ runner.os }}-cargo"
       - name: "Install System Deps"
         shell: bash
         run: "env CI=yes PATH=$PATH ./get-deps"
@@ -49,7 +49,7 @@ jobs:
         uses: baptiste0928/cargo-install@v2
         with:
           crate: "cargo-nextest"
-          cache-key: "fedora36"
+          cache-key: "fedora39"
       - name: "Test (Release mode)"
         shell: bash
         run: "cargo nextest run --all --release --no-fail-fast"
@@ -62,7 +62,7 @@ jobs:
       - name: "Upload artifact"
         uses: actions/upload-artifact@v3
         with:
-          name: "fedora36"
+          name: "fedora39"
           path: "wezterm-*.rpm"
 
   upload:
@@ -78,7 +78,7 @@ jobs:
       - name: "Download artifact"
         uses: actions/download-artifact@v3
         with:
-          name: "fedora36"
+          name: "fedora39"
       - name: "Checksum"
         shell: bash
         run: "for f in wezterm-*.rpm ; do sha256sum $f > $f.sha256 ; done"
diff --git a/ci/generate-workflows.py b/ci/generate-workflows.py
index f66c714e309..baa4531b7bc 100755
--- a/ci/generate-workflows.py
+++ b/ci/generate-workflows.py
@@ -946,9 +946,9 @@ def tag(self):
     Target(name="centos9", container="quay.io/centos/centos:stream9"),
     Target(name="macos", os="macos-11"),
     # https://fedoraproject.org/wiki/End_of_life?rd=LifeCycle/EOL
-    Target(container="fedora:36"),
     Target(container="fedora:37"),
     Target(container="fedora:38"),
+    Target(container="fedora:39"),
     # Target(container="alpine:3.15"),
     Target(name="windows", os="windows-latest", rust_target="x86_64-pc-windows-msvc"),
 ]
diff --git a/docs/install/linux.md b/docs/install/linux.md
index 91b5cb81766..1cf55d3e5e0 100644
--- a/docs/install/linux.md
+++ b/docs/install/linux.md
@@ -145,9 +145,10 @@ on most Linux systems.
 |CentOS7     |[{{ centos7_rpm_stable_asset }}]({{ centos7_rpm_stable }}) |[{{ centos7_rpm_nightly_asset }}]({{ centos7_rpm_nightly }})|
 |CentOS8     |[{{ centos8_rpm_stable_asset }}]({{ centos8_rpm_stable }}) |[{{ centos8_rpm_nightly_asset }}]({{ centos8_rpm_nightly }})|
 |CentOS9     |[{{ centos9_rpm_stable_asset }}]({{ centos9_rpm_stable }})|[{{ centos9_rpm_nightly_asset }}]({{ centos9_rpm_nightly }})|
-|Fedora36    |[{{ fedora36_rpm_stable_asset }}]({{ fedora36_rpm_stable }})|[{{ fedora36_rpm_nightly_asset }}]({{ fedora36_rpm_nightly }})|
+|Fedora36    |[{{ fedora36_rpm_stable_asset }}]({{ fedora36_rpm_stable }})|No longer supported|
 |Fedora37    |[{{ fedora37_rpm_stable_asset }}]({{ fedora37_rpm_stable }})|[{{ fedora37_rpm_nightly_asset }}]({{ fedora37_rpm_nightly }})|
 |Fedora38    |[{{ fedora38_rpm_stable_asset }}]({{ fedora38_rpm_stable }})|[{{ fedora38_rpm_nightly_asset }}]({{ fedora38_rpm_nightly }})|
+|Fedora39    |Nightly only|[{{ fedora39_rpm_nightly_asset }}]({{ fedora39_rpm_nightly }})|
 |openSUSE Leap    |[{{ opensuse_leap_rpm_stable_asset }}]({{ opensuse_leap_rpm_stable }})|Use COPR instead|
 |openSUSE Tumbleweed    |[{{ opensuse_tumbleweed_rpm_stable_asset }}]({{ opensuse_tumbleweed_rpm_stable }})|Use COPR instead|