diff --git a/research/object_detection/model_main_tf2.py b/research/object_detection/model_main_tf2.py
index a97bd5901e0..e9ea65513a4 100644
--- a/research/object_detection/model_main_tf2.py
+++ b/research/object_detection/model_main_tf2.py
@@ -87,7 +87,7 @@ def main(unused_argv):
         sample_1_of_n_eval_on_train_examples=(
             FLAGS.sample_1_of_n_eval_on_train_examples),
         checkpoint_dir=FLAGS.checkpoint_dir,
-        wait_interval=300, timeout=FLAGS.eval_timeout)
+        wait_interval=0, timeout=FLAGS.eval_timeout)
   else:
     if FLAGS.use_tpu:
       # TPU is automatically inferred if tpu_name is None and
diff --git a/research/object_detection/packages/tf2/setup_2.4.0.py b/research/object_detection/packages/tf2/setup_2.4.0.py
new file mode 100644
index 00000000000..c3c1182b0a0
--- /dev/null
+++ b/research/object_detection/packages/tf2/setup_2.4.0.py
@@ -0,0 +1,47 @@
+"""Setup script for object_detection with TF2.0."""
+import os
+from setuptools import find_packages
+from setuptools import setup
+
+# Note: adding apache-beam to required packages causes conflict with
+# tf-models-offical requirements. These packages request for incompatible
+# oauth2client package.
+REQUIRED_PACKAGES = [
+    # Required for apache-beam with PY3
+    'avro-python3',
+    'apache-beam',
+    'pillow',
+    'lxml',
+    'matplotlib',
+    'Cython',
+    'contextlib2',
+    'tf-slim',
+    'six',
+    'pycocotools',
+    'lvis',
+    'scipy',
+    'pandas',
+    'tf-models-official==2.4.0',
+    'tensorboard==2.4.0',
+    'tensorflow==2.4.0',
+    'tensorflow-estimator==2.4.0'
+]
+
+setup(
+    name='object_detection',
+    version='0.1',
+    install_requires=REQUIRED_PACKAGES,
+    include_package_data=True,
+    packages=(
+        [p for p in find_packages() if p.startswith('object_detection')] +
+        find_packages(where=os.path.join('.', 'slim'))),
+    package_dir={
+        'datasets': os.path.join('slim', 'datasets'),
+        'nets': os.path.join('slim', 'nets'),
+        'preprocessing': os.path.join('slim', 'preprocessing'),
+        'deployment': os.path.join('slim', 'deployment'),
+        'scripts': os.path.join('slim', 'scripts'),
+    },
+    description='Tensorflow Object Detection Library',
+    python_requires='>3.6',
+)