diff --git a/.gitea/workflows/cleanup-pr.yml b/.gitea/workflows/cleanup-pr.yml
new file mode 100644
index 0000000..3b7d773
--- /dev/null
+++ b/.gitea/workflows/cleanup-pr.yml
@@ -0,0 +1,14 @@
+name: Cleanup Staging on Merge
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Stop Staging Container
+        run: |
+          docker rm -f fbird-staging || true
+          echo "Staging container stopped."
\ No newline at end of file
diff --git a/.gitea/workflows/stop-staging.yml b/.gitea/workflows/stop-staging.yml
deleted file mode 100644
index 1958838..0000000
--- a/.gitea/workflows/stop-staging.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Stop Staging Environment
-
-# Allows you to trigger this manually from the Gitea UI
-on:
-  workflow_dispatch:
-
-jobs:
-  stop-staging:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Stop and Remove Staging Container
-        run: |
-          echo "Tearing down staging container..."
-          docker rm -f fbird-staging || true
-          echo "Staging environment stopped successfully!"
\ No newline at end of file