diff --git a/Gemfile b/Gemfile
index e85488a34fba49ab36b12f29d7cc77a0664ea3b1..b70e5ea917c4b43a17ece4a39f49a19243c2ea78 100644
--- a/Gemfile
+++ b/Gemfile
@@ -495,9 +495,9 @@ gem 'google-protobuf', '~> 3.21'
 gem 'toml-rb', '~> 2.0'
 
 # Feature toggles
-gem 'flipper', '~> 0.25.0'
-gem 'flipper-active_record', '~> 0.25.0'
-gem 'flipper-active_support_cache_store', '~> 0.25.0'
+gem 'flipper', '~> 0.21.0'
+gem 'flipper-active_record', '~> 0.21.0'
+gem 'flipper-active_support_cache_store', '~> 0.21.0'
 gem 'unleash', '~> 3.2.2'
 gem 'gitlab-experiment', '~> 0.7.1'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f04445e1d571b764a99445b35f7e1f13fb2196db..154daf1ad964a3d961ca94a1cad7f02d63ee7ad1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -438,13 +438,13 @@ GEM
       libyajl2 (~> 1.2)
     filelock (1.1.1)
     find_a_port (1.0.1)
-    flipper (0.25.0)
-    flipper-active_record (0.25.0)
-      activerecord (>= 4.2, < 8)
-      flipper (~> 0.25.0)
-    flipper-active_support_cache_store (0.25.0)
-      activesupport (>= 4.2, < 8)
-      flipper (~> 0.25.0)
+    flipper (0.21.0)
+    flipper-active_record (0.21.0)
+      activerecord (>= 5.0, < 7)
+      flipper (~> 0.21.0)
+    flipper-active_support_cache_store (0.21.0)
+      activesupport (>= 5.0, < 7)
+      flipper (~> 0.21.0)
     flowdock (0.7.1)
       httparty (~> 0.7)
       multi_json
@@ -1557,9 +1557,9 @@ DEPENDENCIES
   faraday_middleware-aws-sigv4 (~> 0.3.0)
   fast_blank
   ffaker (~> 2.10)
-  flipper (~> 0.25.0)
-  flipper-active_record (~> 0.25.0)
-  flipper-active_support_cache_store (~> 0.25.0)
+  flipper (~> 0.21.0)
+  flipper-active_record (~> 0.21.0)
+  flipper-active_support_cache_store (~> 0.21.0)
   flowdock (~> 0.7)
   fog-aliyun (~> 0.3)
   fog-aws (~> 3.14)