diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 49a5d855a..015cfdd01 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -364,7 +364,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python: ['3.6', '3.7', '3.8']
+        python: ['3.6', '3.7', '3.8', '3.9']
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v1
@@ -393,7 +393,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python: ['3.7', '3.8']
+        python: ['3.7', '3.8', '3.9']
     steps:
       - uses: actions/checkout@v2
       - uses: actions/download-artifact@v1
@@ -479,6 +479,10 @@ jobs:
         with:
           name: Windows-3.8-wheel
           path: Windows-3.8-wheel
+      - uses: actions/download-artifact@v1
+        with:
+          name: Windows-3.9-wheel
+          path: Windows-3.9-wheel
       - run: |
           set -e -x
           mkdir -p wheelhouse
@@ -492,6 +496,7 @@ jobs:
           cp Windows-3.6-wheel/*.whl wheelhouse/
           cp Windows-3.7-wheel/*.whl wheelhouse/
           cp Windows-3.8-wheel/*.whl wheelhouse/
+          cp Windows-3.9-wheel/*.whl wheelhouse/
           ls -la wheelhouse/
           sha256sum wheelhouse/*.whl
       - uses: actions/upload-artifact@v1
@@ -625,7 +630,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        python: ['3.6', '3.7', 3.8]
+        python: ['3.6', '3.7', '3.8', '3.9']
     steps:
       - uses: actions/download-artifact@v1
         with:
@@ -699,6 +704,10 @@ jobs:
         with:
           name: Windows-3.8-nightly
           path: Windows-3.8-nightly
+      - uses: actions/download-artifact@v1
+        with:
+          name: Windows-3.9-nightly
+          path: Windows-3.9-nightly
       - run: |
           set -e -x
           mkdir -p dist
@@ -712,6 +721,7 @@ jobs:
           cp Windows-3.6-nightly/*.whl dist/
           cp Windows-3.7-nightly/*.whl dist/
           cp Windows-3.8-nightly/*.whl dist/
+          cp Windows-3.9-nightly/*.whl dist/
           ls -la dist/
           sha256sum dist/*.whl
       - uses: pypa/gh-action-pypi-publish@master
diff --git a/tensorflow_io/core/plugins/file_system_plugins.cc b/tensorflow_io/core/plugins/file_system_plugins.cc
index 347018d7d..5cf1bc4d9 100644
--- a/tensorflow_io/core/plugins/file_system_plugins.cc
+++ b/tensorflow_io/core/plugins/file_system_plugins.cc
@@ -31,24 +31,12 @@ void TF_InitPlugin(TF_FilesystemPluginInfo* info) {
   tensorflow::io::az::ProvideFilesystemSupportFor(&info->ops[0], "az");
   tensorflow::io::http::ProvideFilesystemSupportFor(&info->ops[1], "http");
   if (enable_legacy == "true" || enable_legacy == "1") {
-// TODO: enable on windows once tf-nightly releases windows build
-// that contains TF_ENABLE_LEGACY_FILESYSTEM.
-#if defined(_MSC_VER)
-    tensorflow::io::s3::ProvideFilesystemSupportFor(&info->ops[2], "s3");
-#else
     tensorflow::io::s3::ProvideFilesystemSupportFor(&info->ops[2], "s3e");
-#endif
     tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[3], "hdfse");
     tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[4], "viewfse");
     tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[5], "hare");
   } else {
-// TODO: enable on windows once tf-nightly releases windows build
-// that contains TF_ENABLE_LEGACY_FILESYSTEM.
-#if defined(_MSC_VER)
-    tensorflow::io::s3::ProvideFilesystemSupportFor(&info->ops[2], "s3e");
-#else
     tensorflow::io::s3::ProvideFilesystemSupportFor(&info->ops[2], "s3");
-#endif
     tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[3], "hdfs");
     tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[4], "viewfs");
     tensorflow::io::hdfs::ProvideFilesystemSupportFor(&info->ops[5], "har");