diff --git a/builder/image-build-ros.sh b/builder/image-build-ros.sh
index 599ac4d0..2e456a43 100755
--- a/builder/image-build-ros.sh
+++ b/builder/image-build-ros.sh
@@ -18,7 +18,7 @@ set -ex # exit on error, echo commands
 
 ROS_DISTRO=noetic
 . /etc/os-release # set $VERSION_CODENAME to Debian release code name
-export ROS_OS_OVERRIDE=debian:$VERSION_CODENAME
+export ROS_OS_OVERRIDE=debian:11:$VERSION_CODENAME
 
 echo "=== Building ROS from scratch"
 
@@ -85,7 +85,7 @@ apt-get install -y python3-bloom debhelper dpkg-dev
 for file in `find . -name "package.xml" -not -path "*/debian/*"`; do
 	cd $(dirname ${file})
 	rm -rf debian
-	bloom-generate rosdebian --ros-distro $ROS_DISTRO
+	bloom-generate rosdebian --os-name debian --os-version $VERSION_CODENAME --ros-distro $ROS_DISTRO
 	fakeroot debian/rules binary
 	cd -
 done