diff --git a/website/Dockerfile b/website/Dockerfile
index 690b07095..be2ec6165 100644
--- a/website/Dockerfile
+++ b/website/Dockerfile
@@ -1,11 +1,14 @@
-FROM ubuntu:22.10
+FROM ubuntu:23.04
 LABEL MAINTAINER="Niraj Tolia"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-# NOTE for lines 13,15: update in CI when updating
-RUN apt-get -y update && apt-get -y install gpg emacs curl zip git make \
-  && curl -fsSL https://deb.nodesource.com/setup_current.x | bash - \
+# NOTE for lines 17,19: update in CI when updating
+RUN apt-get -y update && apt-get -y install gpg curl git make ca-certificates gnupg \
+  && mkdir -p /etc/apt/keyrings \
+  && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+  && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \
+  && apt-get update \
   && apt-get -y install nodejs \
   && apt-get autoclean \
   && node --version \
diff --git a/website/Makefile b/website/Makefile
index 537e83e97..e9ec44d20 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -1,6 +1,6 @@
 .PHONY: buildimage build dev shell check genclidocs _validatemdgen publish sync
 
-GO_VERSION := 1.20
+GO_VERSION := 1.21
 CORSO_BUILD_DIR := /tmp/.corsobuild
 CORSO_BUILD_CACHE := ${CORSO_BUILD_DIR}/cache
 CORSO_BUILD_MOD := ${CORSO_BUILD_DIR}/mod