diff --git a/ros_buildfarm/scripts/ci/build_task_generator.py b/ros_buildfarm/scripts/ci/build_task_generator.py
index 88bb423f3..ee0e3f1ae 100644
--- a/ros_buildfarm/scripts/ci/build_task_generator.py
+++ b/ros_buildfarm/scripts/ci/build_task_generator.py
@@ -29,7 +29,6 @@
 from ros_buildfarm.argument import add_argument_install_packages
 from ros_buildfarm.argument import add_argument_os_code_name
 from ros_buildfarm.argument import add_argument_os_name
-from ros_buildfarm.argument import add_argument_require_gpu_support
 from ros_buildfarm.argument import add_argument_ros_version
 from ros_buildfarm.argument import add_argument_rosdistro_name
 from ros_buildfarm.argument import add_argument_run_abichecker
@@ -61,7 +60,6 @@ def main(argv=sys.argv[1:]):
     add_argument_install_packages(parser)
     add_argument_ros_version(parser)
     add_argument_run_abichecker(parser)
-    add_argument_require_gpu_support(parser)
     add_argument_testing(parser)
     parser.add_argument(
         '--workspace-root', nargs='+',
@@ -132,7 +130,6 @@ def main(argv=sys.argv[1:]):
 
         'testing': args.testing,
         'run_abichecker': args.run_abichecker,
-        'require_gpu_support': args.require_gpu_support,
         'workspace_root': mapped_workspaces[-1][1],
         'parent_result_space': [mapping[1] for mapping in mapped_workspaces[:-1]],
     }
diff --git a/ros_buildfarm/templates/devel/devel_task.Dockerfile.em b/ros_buildfarm/templates/devel/devel_task.Dockerfile.em
index 5f9c02437..aac03ff29 100644
--- a/ros_buildfarm/templates/devel/devel_task.Dockerfile.em
+++ b/ros_buildfarm/templates/devel/devel_task.Dockerfile.em
@@ -129,8 +129,6 @@ else:
         ' /tmp/ros_buildfarm/scripts/devel/build_and_test.py' + \
         ' --rosdistro-name %s' % (rosdistro_name or "''") + \
         ' --ros-version ' + str(ros_version)
-    if require_gpu_support:
-        cmd += ' --require-gpu-support'
 cmd += \
     ' --build-tool ' + build_tool + \
     ' --workspace-root ' + workspace_root + \