diff --git a/Dockerfile b/Dockerfile
index 87b6ae29e70..37e67814106 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,13 +22,14 @@ RUN pip install future numpy setuptools wheel && \
     rm -rf /root/.cache/pip/
 
 RUN if [ ${PYV} != "37" ] ; then \
-        pip install tensorflow-gpu==1.7 && \
-        pip install tensorflow-gpu==1.11 --target /tensorflow/1_11 && \
-        pip install tensorflow-gpu==1.12rc2 --target /tensorflow/1_12 && \
-        pip install tf-nightly-gpu --target /tensorflow/nightly; \
-    else \
-        # only nightly build of TF supports python 3.7 at that time
-        pip install tf-nightly-gpu; \
+        pip install tensorflow-gpu==1.7                                && \
+        pip install tensorflow-gpu==1.11   --target /tensorflow/1_11   && \
+        pip install tensorflow-gpu==1.12   --target /tensorflow/1_12   && \
+        pip install tensorflow-gpu==1.13.1 --target /tensorflow/1_13   && \
+        pip install tensorflow-gpu         --target /tensorflow/latest;   \
+    else                                                                  \
+        # Older versions not supported on python 3.7
+        pip install tensorflow-gpu; \
     fi && \
     rm -rf /root/.cache/pip/
 
diff --git a/dali/python/nvidia/dali/plugin/tf.py b/dali/python/nvidia/dali/plugin/tf.py
index 7a87be2fe72..6a8376dcc7c 100644
--- a/dali/python/nvidia/dali/plugin/tf.py
+++ b/dali/python/nvidia/dali/plugin/tf.py
@@ -19,11 +19,10 @@
 
 _tf_plugins = glob.glob(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'libdali_tf*.so'))
 _dali_tf_module = None
-# Order: 'current', numbered versions, nightly build
+# Order: 'current', prebuilt versions
 _dali_tf_current = list(filter(lambda x: 'current' in x, _tf_plugins))
-_dali_tf_numbered = list(filter(lambda x: 'current' not in x and 'nightly' not in x, _tf_plugins))
-_dali_tf_nightly = list(filter(lambda x: 'nightly' in x, _tf_plugins))
-_processed_tf_plugins = _dali_tf_current + _dali_tf_numbered + _dali_tf_nightly
+_dali_tf_prebuilt = list(filter(lambda x: 'current' not in x, _tf_plugins))
+_processed_tf_plugins = _dali_tf_current + _dali_tf_prebuilt
 
 for _libdali_tf in _processed_tf_plugins:
   try: