diff --git a/.github/workflows/quarto-docs.yml b/.github/workflows/quarto-docs.yml
index 6dca63d4f..a4dfb9d76 100644
--- a/.github/workflows/quarto-docs.yml
+++ b/.github/workflows/quarto-docs.yml
@@ -18,34 +18,10 @@ jobs:
       - name: Set up Quarto
         uses: quarto-dev/quarto-actions/setup@v2
 
-      ## We could render and publish in one step, however we need to, at
-      ## least temporarily, preserve the old en/latest/ paths from the
-      ## readthedocs version. So we render, create the link, then publish.
-      #- name: Render and Publish
-      #  uses: quarto-dev/quarto-actions/publish@v2
-      #  with:
-      #    path: ./docs
-      #    target: gh-pages
-      #  env:
-      #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Render
-        uses: quarto-dev/quarto-actions/render@v2
-        with:
-          path: ./docs
-          to: html
-
-      - name: Create en/latest symlink
-        run: |
-          mkdir ./docs/_site/en
-          cd docs/_site/en
-          ln -s ../../_site latest
-
-      - name: Publish
+      - name: Render and Publish
         uses: quarto-dev/quarto-actions/publish@v2
         with:
           path: ./docs
           target: gh-pages
-          render: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docs/admins/howto/calendar-scaler.qmd b/docs/admins/howto/calendar-scaler.qmd
index 9ffcc6d46..47304c872 100644
--- a/docs/admins/howto/calendar-scaler.qmd
+++ b/docs/admins/howto/calendar-scaler.qmd
@@ -131,8 +131,7 @@ functions.
 When you're ready, create a PR. The deployment workflow is as follows:
 
 1.  Get all authed-up for `chartpress` by performing the
-    steps listed
-    [here](https://docs.datahub.berkeley.edu/en/latest/admins/howto/rebuild-hub-image.html#).
+    [documented steps](rebuild-hub-image.qmd).
 2.  Run `chartpress --push` from the root
     `datahub/` directory. If this succeeds, check your `git
     status` and add
@@ -155,8 +154,7 @@ to change/add/update any packages, you'll need to do the following:
 5.  Check your git status and diffs, and create a pull request if
     necessary.
 6.  Get all authed-up for `chartpress` by performing the
-    steps listed
-    [here](https://docs.datahub.berkeley.edu/en/latest/admins/howto/rebuild-hub-image.html#).
+    [documented steps](rebuild-hub-image.qmd).
 7.  Run `chartpress --push` from the root
     `datahub/` directory. If this succeeds, check your `git
     status` and add
diff --git a/docs/admins/howto/clusterswitch.qmd b/docs/admins/howto/clusterswitch.qmd
index 1a814051d..5d4d54d06 100644
--- a/docs/admins/howto/clusterswitch.qmd
+++ b/docs/admins/howto/clusterswitch.qmd
@@ -7,8 +7,7 @@ This document describes how to switch an existing hub to a new cluster.  The exa
 You might find it easier to switch to a new cluster if you're running a [very old k8s version](https://cloud.google.com/kubernetes-engine/docs/release-notes), or in lieu of performing a [cluster credential rotation](https://cloud.google.com/kubernetes-engine/docs/how-to/credential-rotation).  Sometimes starting from scratch is easier than an iterative and potentially destructive series of operations.
 
 ## Create a new cluster
-1. Create a new cluster using the specifications here:  
-   https://docs.datahub.berkeley.edu/en/latest/admins/cluster-config.html
+1. Create a new cluster using the specified [configuration](../cluster-config.qmd).
 2. Set up helm on the cluster according to the instructions here:  
    http://z2jh.jupyter.org/en/latest/setup-helm.html
      - Make sure the version of helm you're working with matches the version CircleCI is using.  
@@ -47,7 +46,7 @@ configured on the new cluster.  Until this is done, `hubploy` and `helm` will fa
 4. Change the corresponding entry in `support/requirements.yaml` to `$cert-manager-version` and commit the changes (do not push).
 
 ## Create the node-placeholder k8s namespace
-The [calendar autoscaler](https://docs.datahub.berkeley.edu/en/latest/admins/howto/calendar-scaler.html) requires the `node-placeholder` namespace.  Run the following command to create it:
+The [calendar autoscaler](calendar-scaler.qmd) requires the `node-placeholder` namespace.  Run the following command to create it:
 
 ```bash
 kubectl create namespace node-placeholder
diff --git a/docs/admins/howto/new-hub.qmd b/docs/admins/howto/new-hub.qmd
index e2781f338..53d655c0a 100644
--- a/docs/admins/howto/new-hub.qmd
+++ b/docs/admins/howto/new-hub.qmd
@@ -1,5 +1,7 @@
 ---
 title: Create a New Hub
+aliases:
+  - ../../en/latest/admin/howto/new-hub.html
 ---
 
 ## Why create a new hub?
@@ -386,7 +388,7 @@ prometheus-node-exporter
 
 Besides setting defaults, we can dynamically change the placeholder
 counts by either adding new, or editing existing, [calendar
-events](https://docs.datahub.berkeley.edu/en/latest/admins/howto/calendar-scaler.html).
+events](calendar-scaler.qmd).
 This is useful for large courses which can have placeholder nodes set
 aside for predicatable periods of heavy ramp up.