diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 7a24f27..97cb67d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,3 +1,3 @@
 # Automatically generated CODEOWNERS
 # Regenerate with `make update-codeowners`
-draft-nts-pool.md david@tweedegolf.com
+draft-venhoek-nts-pool.md david@tweedegolf.com folkert@tweedegolf.com marc@tweedegolf.com
diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml
index fd17600..bcebd9f 100644
--- a/.github/workflows/archive.yml
+++ b/.github/workflows/archive.yml
@@ -16,9 +16,11 @@ jobs:
   build:
     name: "Archive Issues and Pull Requests"
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Note: No caching for this build!
 
@@ -39,4 +41,5 @@ jobs:
     - name: "Save Archive"
       uses: actions/upload-artifact@v4
       with:
+        name: archive
         path: archive.json
diff --git a/.github/workflows/ghpages.yml b/.github/workflows/ghpages.yml
index 1cd7365..f779f2b 100644
--- a/.github/workflows/ghpages.yml
+++ b/.github/workflows/ghpages.yml
@@ -18,16 +18,18 @@ jobs:
   build:
     name: "Update Editor's Copy"
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: "Setup"
       id: setup
       run: date -u "+date=%FT%T" >>"$GITHUB_OUTPUT"
 
     - name: "Caching"
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           .refcache
@@ -53,6 +55,7 @@ jobs:
     - name: "Archive Built Drafts"
       uses: actions/upload-artifact@v4
       with:
+        name: drafts
         path: |
           draft-*.html
           draft-*.txt
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8c146db..7143443 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -4,6 +4,12 @@ on:
   push:
     tags:
       - "draft-*"
+  workflow_dispatch:
+    inputs:
+      email:
+        description: "Submitter email"
+        default: ""
+        type: string
 
 jobs:
   build:
@@ -11,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # See https://github.com/actions/checkout/issues/290
     - name: "Get Tag Annotations"
@@ -22,7 +28,7 @@ jobs:
       run: date -u "+date=%FT%T" >>"$GITHUB_OUTPUT"
 
     - name: "Caching"
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           .refcache
@@ -42,8 +48,11 @@ jobs:
       uses: martinthomson/i-d-template@v1
       with:
         make: upload
+      env:
+        UPLOAD_EMAIL: ${{ inputs.email }}
 
     - name: "Archive Submitted Drafts"
       uses: actions/upload-artifact@v4
       with:
+        name: published
         path: "versioned/draft-*-[0-9][0-9].*"
diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index 7a67007..0f8d6b8 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Checkout"
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: "Update Generated Files"
       uses: martinthomson/i-d-template@v1
diff --git a/.gitignore b/.gitignore
index c32a59b..c515649 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,26 @@
+*~
+/*-[0-9][0-9].xml
+archive.json
+draft-nts-pool.xml
+draft-venhoek-nts-pool.xml
+Gemfile.lock
+/.gems/
 *.html
+/.idea/
+/lib
+/.*.mk
+/node_modules/
+package-lock.json
 *.pdf
 *.redxml
+/.refcache
+report.xml
 *.swp
-*.txt
-*.upload
-*~
 .tags
-/*-[0-9][0-9].xml
-/.gems/
-/.refcache
 /.targets.mk
+*.txt
+*.upload
 /.venv/
-/.vscode/
-/lib
-/node_modules/
 /versioned/
-Gemfile.lock
-archive.json
-draft-nts-pool.xml
-package-lock.json
-report.xml
+/.vscode/
 !requirements.txt
diff --git a/Makefile b/Makefile
index de46d56..9a5d15b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,12 @@ include $(LIBDIR)/main.mk
 $(LIBDIR)/main.mk:
 ifneq (,$(shell grep "path *= *$(LIBDIR)" .gitmodules 2>/dev/null))
 	git submodule sync
-	git submodule update $(CLONE_ARGS) --init
+	git submodule update --init
 else
-	git clone -q --depth 10 $(CLONE_ARGS) \
-	    -b main https://github.com/martinthomson/i-d-template $(LIBDIR)
+ifneq (,$(wildcard $(ID_TEMPLATE_HOME)))
+	ln -s "$(ID_TEMPLATE_HOME)" $(LIBDIR)
+else
+	git clone -q --depth 10 -b main \
+	    https://github.com/martinthomson/i-d-template $(LIBDIR)
+endif
 endif
diff --git a/README.md b/README.md
index 07d7ebe..06fee43 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+<!-- regenerate: on (set to off if you edit this file) -->
+
 # NTS extensions for enabling pools
 
 This is the working area for the individual Internet-Draft, "NTS extensions for enabling pools".
@@ -11,7 +13,7 @@ This is the working area for the individual Internet-Draft, "NTS extensions for
 ## Contributing
 
 See the
-[guidelines for contributions](CONTRIBUTING.md).
+[guidelines for contributions](https://github.com/pendulum-project/nts-pool-draft/blob/main/CONTRIBUTING.md).
 
 Contributions can be made by creating pull requests.
 The GitHub interface supports creating pull requests using the Edit (✏) button.