diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6f7aad55e3813e65b739e041c9ccdaf58f44def7..0ed810139304bd81bd0c14d7d0239583e72ee78d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,8 +34,10 @@ build-job:       # This job runs in the build stage, which runs first.
       junit: artifacts/tests_report.xml
 
 pages:
-  image: robertcnelson/beagle-devscripts-ubuntu-23.04-riscv64:latest
-  # https://git.beagleboard.org/beagleboard/ci-docker-images
+  image: robertcnelson/beagle-devscripts-ubuntu-24.04-riscv64:latest
+  # Ubuntu 23.04 packages archive has been shutdown, move to noble (lts) 24.04, for legacy, this image is still published..
+  # image: robertcnelson/beagle-devscripts-ubuntu-23.04-riscv64:latest
+  # https://openbeagle.org/beagleboard/ci-docker-images
   stage: deploy
   tags:
     - docker-riscv64-ci
@@ -59,7 +61,7 @@ pages:
     - rsync -av ./artifacts/$DEBIAN_SRC/* ./src/debian/
     - mkdir -p ./src/gateware-builds-tester || true
     - rsync -av ./artifacts ./src/gateware-builds-tester/
-    - echo "$DEBIAN_CHANGELOG_PKG (1.$(LANG=C date +%Y%m%d).0-0~lunar) lunar; urgency=low" > ./src/debian/changelog
+    - echo "$DEBIAN_CHANGELOG_PKG (1.$(LANG=C date +%Y%m%d).0-0~noble) noble; urgency=low" > ./src/debian/changelog
     - echo "" >> ./src/debian/changelog
     - echo "  * ci build of $CI_PROJECT_URL" >> ./src/debian/changelog
     - echo "" >> ./src/debian/changelog
diff --git a/debian-custom/changelog b/debian-custom/changelog
index 4b97b11a65c5e21629173ceb4a3eabc8c8bae7cf..df61f663a5ab405470568f0de9b679fdbb1cd03d 100644
--- a/debian-custom/changelog
+++ b/debian-custom/changelog
@@ -1,5 +1,5 @@
-bbb.io-gateware-my-custom-fpga-design (1.20231226.0-0~lunar) lunar; urgency=low
+bbb.io-gateware-my-custom-fpga-design (1.20231226.0-0~noble) noble; urgency=low
 
-  * ci build of https://git.beagleboard.org/beaglev-fire/gateware
+  * ci build of https://openbeagle.org/beaglev-fire/gateware
 
  -- Robert Nelson <robertcnelson@beagleboard.org>  Tue, 26 Dec 2023 17:41:26 +0000
diff --git a/debian/changelog b/debian/changelog
index 5e6715d53b694d953e09357ebb477f90e1570421..6089ec6ae80c3b4fb74fe77064f756a29f1c647b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-bbb.io-gateware (1.20231226.0-0~lunar) lunar; urgency=low
+bbb.io-gateware (1.20231226.0-0~noble) noble; urgency=low
 
-  * ci build of https://git.beagleboard.org/beaglev-fire/gateware
+  * ci build of https://openbeagle.org/beaglev-fire/gateware
 
  -- Robert Nelson <robertcnelson@beagleboard.org>  Tue, 26 Dec 2023 17:41:26 +0000