diff --git a/.tool-versions b/.tool-versions
index ece4867aa..9e95a5468 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,3 +1,3 @@
-hugo extended_0.122.0
+hugo extended_0.122.0 # Should match the version in compose.yml
 golang 1.21.0
 nodejs 16.20.2
diff --git a/compose.yml b/compose.yml
index d8c96d340..343032f6a 100644
--- a/compose.yml
+++ b/compose.yml
@@ -3,9 +3,9 @@ version: '3'
 services:
   hugo:
     container_name: cht-hugo
-    image: jakejarvis/hugo-extended:0.113.0 # note that 0.122 isn't avail, but 0.113 has everything we need for now
+    image: docker.io/hugomods/hugo:0.122.0 # Should match the version in .tool-versions
     ports:
       - 1313:1313
     volumes:
       - ./:/src
-    command: server --buildDrafts --buildFuture --bind 0.0.0.0
+    command: hugo server --buildDrafts --buildFuture --bind 0.0.0.0