diff --git a/config/config.exs b/config/config.exs
index 621eb6933..138b866ba 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: [],
+  feature_flags: [deployment_groups: true],
   force_ssl_host: nil,
   learn_notebooks: [],
   plugs: [],
diff --git a/config/dev.exs b/config/dev.exs
index 280b6d790..42eac41fc 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -74,5 +74,3 @@ 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 ebb0a724a..3746fbd95 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -12,6 +12,9 @@ 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/lib/livebook_web/live/session_live/app_settings_component.ex b/lib/livebook_web/live/session_live/app_settings_component.ex
index 1b11edf8b..d94f2bbe7 100644
--- a/lib/livebook_web/live/session_live/app_settings_component.ex
+++ b/lib/livebook_web/live/session_live/app_settings_component.ex
@@ -121,7 +121,7 @@ defmodule LivebookWeb.SessionLive.AppSettingsComponent do
           <button
             class="button-base button-blue"
             type="button"
-            phx-click={JS.patch(~p"/sessions/#{@session.id}") |> JS.push("deploy_app")}
+            phx-click={JS.push("patch_back", target: @myself) |> JS.push("deploy_app")}
             disabled={not @changeset.valid?}
           >
             <.remix_icon icon="rocket-line" class="align-middle mr-1" />
@@ -155,4 +155,9 @@ defmodule LivebookWeb.SessionLive.AppSettingsComponent do
 
     {:noreply, assign(socket, changeset: changeset)}
   end
+
+  # TODO: use JS.patch back once possible (https://github.com/phoenixframework/phoenix_live_view/issues/2954)
+  def handle_event("patch_back", %{}, socket) do
+    {:noreply, push_patch(socket, to: ~p"/sessions/#{socket.assigns.session.id}")}
+  end
 end
diff --git a/mix.exs b/mix.exs
index 167a47531..a9a54f097 100644
--- a/mix.exs
+++ b/mix.exs
@@ -99,8 +99,8 @@ defmodule Livebook.MixProject do
   defp deps do
     [
       {:phoenix, "~> 1.7.8"},
-      # {:phoenix_live_view, "~> 0.20.1"},
-      {:phoenix_live_view, github: "phoenixframework/phoenix_live_view", override: true},
+      {:phoenix_live_view, "~> 0.20.2"},
+      # {:phoenix_live_view, github: "phoenixframework/phoenix_live_view", override: true},
       {:phoenix_html, "~> 3.0"},
       {:phoenix_live_dashboard, "~> 0.8.0"},
       {:telemetry_metrics, "~> 0.4"},
diff --git a/mix.lock b/mix.lock
index 605d72cf9..3e35fed74 100644
--- a/mix.lock
+++ b/mix.lock
@@ -35,7 +35,7 @@
   "phoenix_html": {:hex, :phoenix_html, "3.3.2", "d6ce982c6d8247d2fc0defe625255c721fb8d5f1942c5ac051f6177bffa5973f", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "44adaf8e667c1c20fb9d284b6b0fa8dc7946ce29e81ce621860aa7e96de9a11d"},
   "phoenix_live_dashboard": {:hex, :phoenix_live_dashboard, "0.8.2", "b9e33c950d1ed98494bfbde1c34c6e51c8a4214f3bea3f07ca9a510643ee1387", [:mix], [{:ecto, "~> 3.6.2 or ~> 3.7", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_mysql_extras, "~> 0.5", [hex: :ecto_mysql_extras, repo: "hexpm", optional: true]}, {:ecto_psql_extras, "~> 0.7", [hex: :ecto_psql_extras, repo: "hexpm", optional: true]}, {:ecto_sqlite3_extras, "~> 1.1.7 or ~> 1.2.0", [hex: :ecto_sqlite3_extras, repo: "hexpm", optional: true]}, {:mime, "~> 1.6 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:phoenix_live_view, "~> 0.19 or ~> 1.0", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6 or ~> 1.0", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "67a598441b5f583d301a77e0298719f9654887d3d8bf14e80ff0b6acf887ef90"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.4.1", "2aff698f5e47369decde4357ba91fc9c37c6487a512b41732818f2204a8ef1d3", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "9bffb834e7ddf08467fe54ae58b5785507aaba6255568ae22b4d46e2bb3615ab"},
-  "phoenix_live_view": {:git, "https://github.com/phoenixframework/phoenix_live_view.git", "ce7c2f09501b136e7e2b7b47384fef1f76fa28b0", []},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.2", "025391424257d6c1ed2fab5c9fb11b1e5b21a8b47a416659b9a36492217dd5cb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "381c7f8a5702be838a6bf440a59ea010b458018e1a85cc432e8628641c00f07a"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
   "phoenix_template": {:hex, :phoenix_template, "1.0.1", "85f79e3ad1b0180abb43f9725973e3b8c2c3354a87245f91431eec60553ed3ef", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "157dc078f6226334c91cb32c1865bf3911686f8bcd6bcff86736f6253e6993ee"},
   "plug": {:hex, :plug, "1.15.1", "b7efd81c1a1286f13efb3f769de343236bd8b7d23b4a9f40d3002fc39ad8f74c", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "459497bd94d041d98d948054ec6c0b76feacd28eec38b219ca04c0de13c79d30"},