diff --git a/.github/workflows/external-message.yml b/.github/workflows/external-message.yml
index eb68a36e4..f06d81a47 100644
--- a/.github/workflows/external-message.yml
+++ b/.github/workflows/external-message.yml
@@ -6,14 +6,10 @@ name: PR Comment
 # DO NOT PULL THE PR OR EXECUTE ANY CODE FROM THE PR.
 
 on:
-  workflow_dispatch:
-
-  # Disable because of https://github.com/databricks/cli/issues/2084.
-  #
-  # pull_request_target:
-  #   types: [opened, reopened, synchronize]
-  #   branches:
-  #     - main
+  pull_request_target:
+    types: [opened, reopened, synchronize]
+    branches:
+      - main
 
 jobs:
   comment-on-pr:
diff --git a/.github/workflows/integration-approve.yml b/.github/workflows/integration-approve.yml
index 0f6b209cb..293d31a2a 100644
--- a/.github/workflows/integration-approve.yml
+++ b/.github/workflows/integration-approve.yml
@@ -1,11 +1,7 @@
 name: integration-approve
 
 on:
-  workflow_dispatch:
-
-  # Disable because of https://github.com/databricks/cli/issues/2084.
-  #
-  # merge_group:
+  merge_group:
 
 jobs:
   # Trigger for merge groups.
diff --git a/.github/workflows/integration-main.yml b/.github/workflows/integration-main.yml
index 5a78d4fd8..0b6032d50 100644
--- a/.github/workflows/integration-main.yml
+++ b/.github/workflows/integration-main.yml
@@ -1,13 +1,9 @@
 name: integration-main
 
 on:
-  workflow_dispatch:
-
-  # Disable because of https://github.com/databricks/cli/issues/2084.
-  #
-  # push:
-  #   branches:
-  #     - main
+  push:
+    branches:
+      - main
 
 jobs:
   # Trigger for pushes to the main branch.
diff --git a/.github/workflows/integration-pr.yml b/.github/workflows/integration-pr.yml
index fd170f77e..0f9c4797a 100644
--- a/.github/workflows/integration-pr.yml
+++ b/.github/workflows/integration-pr.yml
@@ -1,12 +1,8 @@
 name: integration-pr
 
 on:
-  workflow_dispatch:
-
-  # Disable because of https://github.com/databricks/cli/issues/2084.
-  #
-  # pull_request:
-  #   types: [opened, synchronize]
+  pull_request:
+    types: [opened, synchronize]
 
 jobs:
   # Trigger for pull requests.