diff --git a/.gitmodules b/.gitmodules
index ef77ae7..8340615 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
 [submodule "feast"]
 	path = feast
 	url = https://github.com/feast-dev/feast.git
+	branch = v0.21-branch
diff --git a/feast b/feast
index bdecb10..bdd47d0 160000
--- a/feast
+++ b/feast
@@ -1 +1 @@
-Subproject commit bdecb10367aad79ec11265b3e15eceeb8b9a040a
+Subproject commit bdd47d041c7c8d5f71cb8bcd7fa0c24a45e8eb0f