diff --git a/.github/workflows/trigger-deploy.yml b/.github/workflows/trigger-deploy.yml
new file mode 100644
index 00000000..898ac01b
--- /dev/null
+++ b/.github/workflows/trigger-deploy.yml
@@ -0,0 +1,19 @@
+name: Trigger Dev Deployment
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  trigger:
+    name: Trigger deployment in infra repo
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger repository_dispatch
+        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0
+        with:
+          token: ${{ secrets.REMOTE_REPO_TOKEN }}
+          repository: hashicorp/terraform-mcp-server-remote
+          event-type: deploy-dev
+          client-payload: '{"sha": "${{ github.sha }}", "ref": "${{ github.ref }}"}'
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 572d73a4..47748a7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ FIXES
 
 IMPROVEMENTS
 
+* Add automated dev deployment workflow triggered on main branch merges
 * Add `--heartbeat-interval` CLI flag and `MCP_HEARTBEAT_INTERVAL` env var for HTTP heartbeat in load-balanced environments
 * Set custom User-Agent header for TFE API requests to enable tracking MCP server usage separately from other go-tfe clients [268](https://github.com/hashicorp/terraform-mcp-server/pull/268)
 * Adding a new cli flags `--log-level` to set the desired log level for the server logs and `--log-format` for the logs formatting [286](https://github.com/hashicorp/terraform-mcp-server/pull/286)