diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index a13e469286..b8e978d507 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -9,7 +9,7 @@ ARG UBUNTU_CODENAME=focal
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y curl gnupg2 binutils
 
-RUN curl -fsSLo /usr/share/keyrings/gramine-keyring.gpg https://packages.gramineproject.io/gramine-keyring.gpg && \
+RUN curl -fsSLo /usr/share/keyrings/gramine-keyring.gpg https://packages.gramineproject.io/gramine-keyring-${UBUNTU_CODENAME}.gpg && \
     echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/gramine-keyring.gpg] https://packages.gramineproject.io/ '${UBUNTU_CODENAME}' main' > /etc/apt/sources.list.d/gramine.list
 
 RUN curl -fsSLo /usr/share/keyrings/intel-sgx-deb.key https://download.01.org/intel-sgx/sgx_repo/ubuntu/intel-sgx-deb.key && \
diff --git a/packaging/docker/build.sh b/packaging/docker/build.sh
index adaaeaeead..120c9ecee6 100755
--- a/packaging/docker/build.sh
+++ b/packaging/docker/build.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 usage() {
-    echo "Usage: build.sh [ubuntu20,ubuntu22]"
+    echo "Usage: build.sh [ubuntu20,ubuntu22,ubuntu24]"
     exit 1
 }
 
@@ -21,6 +21,10 @@ case "$1" in
         image="ubuntu:22.04"
         codename="jammy"
         ;;
+    ubuntu24)
+        image="ubuntu:24.04"
+        codename="noble"
+        ;;
     *)
         usage
         ;;