diff --git a/ports/tensorflow-common/Update-bazel-max-version.patch b/ports/tensorflow-common/Update-bazel-max-version.patch
new file mode 100644
index 00000000000000..9dffd884b0206b
--- /dev/null
+++ b/ports/tensorflow-common/Update-bazel-max-version.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.py b/configure.py
+index e5428a6..9324d7b 100644
+--- a/configure.py
++++ b/configure.py
+@@ -47,7 +47,7 @@ _TF_WORKSPACE_ROOT = ''
+ _TF_BAZELRC = ''
+ _TF_CURRENT_BAZEL_VERSION = None
+ _TF_MIN_BAZEL_VERSION = '3.1.0'
+-_TF_MAX_BAZEL_VERSION = '3.99.0'
++_TF_MAX_BAZEL_VERSION = '4.1.0'
+ 
+ NCCL_LIB_PATHS = [
+     'lib64/', 'lib/powerpc64le-linux-gnu/', 'lib/x86_64-linux-gnu/', ''
diff --git a/ports/tensorflow-common/portfile.cmake b/ports/tensorflow-common/portfile.cmake
index 7aacbbc206f912..e505c4430ed748 100644
--- a/ports/tensorflow-common/portfile.cmake
+++ b/ports/tensorflow-common/portfile.cmake
@@ -18,6 +18,7 @@ set(TENSORFLOW_FILES
     "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-static.cmake.in"
     "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-dll.cmake.in"
     "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-lib.cmake.in"
+    "${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch"
     )
 
 file(COPY ${TENSORFLOW_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake
index 90cba9197e0498..776cb9c0069829 100644
--- a/ports/tensorflow-common/tensorflow-common.cmake
+++ b/ports/tensorflow-common/tensorflow-common.cmake
@@ -138,6 +138,7 @@ foreach(BUILD_TYPE dbg rel)
 		HEAD_REF master
 		PATCHES
 			"${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" # Fix namespace error
+			"${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch"
 			${STATIC_ONLY_PATCHES}
 			${WINDOWS_ONLY_PATCHES}
 			${LINUX_ONLY_PATCHES}
diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json
index 35d2fdb2675271..d97e2c228c5518 100644
--- a/ports/tensorflow-common/vcpkg.json
+++ b/ports/tensorflow-common/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "tensorflow-common",
   "version-semver": "2.4.1",
-  "port-version": 2,
+  "port-version": 3,
   "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.",
   "homepage": "https://github.com/tensorflow/tensorflow"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 2b77f92ecbdb86..901f4221004f86 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6186,7 +6186,7 @@
     },
     "tensorflow-common": {
       "baseline": "2.4.1",
-      "port-version": 2
+      "port-version": 3
     },
     "tensorpipe": {
       "baseline": "2021-04-26",
diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json
index 3ac6d830ed38e4..cbe798a9e67d36 100644
--- a/versions/t-/tensorflow-common.json
+++ b/versions/t-/tensorflow-common.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "dd652b405ef53658c13af438e8414110f2977520",
+      "version-semver": "2.4.1",
+      "port-version": 3
+    },
     {
       "git-tree": "84ba326c66ab77faaf3e59d8eb3f04ffa155a4bb",
       "version-semver": "2.4.1",