diff --git a/scripts/common.sh b/scripts/common.sh
index 8dd00a10..85725f6a 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -28,6 +28,7 @@ OSMO_RELEASE_REPOS="
 	osmo-trx
 	osmocom-bb
 "
+#TODO: Add above once we have releases: osmo-hnodeb, osmo-gbproxy
 
 OSMO_BRANCH_DOCKER_PLAYGROUND="${OSMO_BRANCH_DOCKER_PLAYGROUND:-master}"
 
diff --git a/scripts/osmocom-nightly-packages.sh b/scripts/osmocom-nightly-packages.sh
index d9fd9969..2bdc4f00 100755
--- a/scripts/osmocom-nightly-packages.sh
+++ b/scripts/osmocom-nightly-packages.sh
@@ -265,6 +265,7 @@ build_osmocom() {
   build osmo-smlc
   build osmo-cbc
   build osmo-gbproxy
+  build osmo-hnodeb
 
   post
 }
diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh
index e47b4ecc..1ba94d9e 100755
--- a/scripts/repo-install-test/run-inside-docker.sh
+++ b/scripts/repo-install-test/run-inside-docker.sh
@@ -31,6 +31,7 @@ SERVICES="
 # * osmo-pcap-server 0.2.0: VTY port in default config conflicts with osmo-bts (OS#5203)
 SERVICES_NIGHTLY="
 	osmo-pcap-server
+	osmo-hnodeb
 "
 
 distro_obsdir() {