diff --git a/create_jenkins_job.py b/create_jenkins_job.py
index 16b512803..9e8f31456 100755
--- a/create_jenkins_job.py
+++ b/create_jenkins_job.py
@@ -91,7 +91,7 @@ def main(argv=None):
         'turtlebot_demo': False,
         'build_timeout_mins': 0,
         'ubuntu_distro': 'focal',
-        'ros_distro': 'foxy',
+        'ros_distro': 'rolling',
     }
 
     jenkins = connect(args.jenkins_url)
diff --git a/job_templates/ci_job.xml.em b/job_templates/ci_job.xml.em
index e60e459da..a998f2d07 100644
--- a/job_templates/ci_job.xml.em
+++ b/job_templates/ci_job.xml.em
@@ -358,6 +358,10 @@ setlocal enableDelayedExpansion
 rmdir /S /Q ws workspace "work space"
 
 echo "# BEGIN SECTION: Build DockerFile"
+@# Rolling uses the Foxy Dockerfile.
+if "!CI_ROS_DISTRO!" == "rolling" (
+  set "CI_ROS_DISTRO=foxy"
+)
 @# Eloquent uses the Dashing Dockerfile.
 if "!CI_ROS_DISTRO!" == "eloquent" (
   set "CI_ROS_DISTRO=dashing"
diff --git a/job_templates/packaging_job.xml.em b/job_templates/packaging_job.xml.em
index fc2d4cdf5..f2416816a 100644
--- a/job_templates/packaging_job.xml.em
+++ b/job_templates/packaging_job.xml.em
@@ -344,6 +344,10 @@ setlocal enableDelayedExpansion
 rmdir /S /Q ws workspace
 
 echo "# BEGIN SECTION: Build DockerFile"
+@# Rolling uses the Foxy Dockerfile.
+if "!CI_ROS_DISTRO!" == "rolling" (
+  set "CI_ROS_DISTRO=foxy"
+)
 @# Eloquent uses the Dashing Dockerfile.
 if "!CI_ROS_DISTRO!" == "eloquent" (
   set "CI_ROS_DISTRO=dashing"
diff --git a/job_templates/snippet/property_parameter-definition_common.xml.em b/job_templates/snippet/property_parameter-definition_common.xml.em
index 5e5bd63cb..0fa444dc7 100644
--- a/job_templates/snippet/property_parameter-definition_common.xml.em
+++ b/job_templates/snippet/property_parameter-definition_common.xml.em
@@ -60,7 +60,7 @@ choices.remove(ubuntu_distro)
             <a class="string-array">
               <string>@ros_distro</string>
 @{
-choices = ['dashing', 'eloquent', 'foxy']
+choices = ['dashing', 'eloquent', 'foxy', 'rolling]
 choices.remove(ros_distro)
 }@
 @[for choice in choices]@