diff --git a/config/config.exs b/config/config.exs
index 138b866ba..621eb6933 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -28,7 +28,7 @@ config :livebook,
   app_service_name: nil,
   app_service_url: nil,
   authentication_mode: :token,
-  feature_flags: [deployment_groups: true],
+  feature_flags: [],
   force_ssl_host: nil,
   learn_notebooks: [],
   plugs: [],
diff --git a/config/dev.exs b/config/dev.exs
index 42eac41fc..280b6d790 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -74,3 +74,5 @@ config :phoenix, :plug_init_mode, :runtime
 config :livebook, :authentication_mode, :disabled
 
 config :livebook, :data_path, Path.expand("tmp/livebook_data/dev")
+
+config :livebook, :feature_flags, deployment_groups: true
diff --git a/config/prod.exs b/config/prod.exs
index 3746fbd95..ebb0a724a 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -12,9 +12,6 @@ config :livebook, LivebookWeb.Endpoint,
 
 config :livebook, :iframe_port, 8081
 
-# Disable all feature flags in production
-config :livebook, :feature_flags, []
-
 # Set log level to warning by default to reduce output
 config :logger, level: :warning
 
diff --git a/config/test.exs b/config/test.exs
index 45d204f2b..9bb4fdad4 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -24,6 +24,8 @@ end
 
 config :livebook, :data_path, data_path
 
+config :livebook, :feature_flags, deployment_groups: true
+
 # Use longnames when running tests in CI, so that no host resolution is required,
 # see https://github.com/livebook-dev/livebook/pull/173#issuecomment-819468549
 if System.get_env("CI") == "true" do