diff --git a/.editorconfig b/.editorconfig
index edc4f8a..5198504 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,5 +11,5 @@ end_of_line = lf
 [*.py]
 max_line_length = 88
 
-[*.sh]
-indent_size = 2
+[*.{sh,yml,yaml}]
+indent_size = 2
\ No newline at end of file
diff --git a/.github/workflows/fast-forward.yml b/.github/workflows/fast-forward.yml
index de4e10c..0b5690f 100644
--- a/.github/workflows/fast-forward.yml
+++ b/.github/workflows/fast-forward.yml
@@ -1,12 +1,14 @@
 name: fast-forward
 on:
   issue_comment:
-    types: [created, edited]
+    types: [ created, edited ]
 jobs:
   fast-forward:
     # Only run if the comment contains the /fast-forward command.
-    if: ${{ contains(github.event.comment.body, '/fast-forward')
-            && github.event.issue.pull_request }}
+    if: |
+      contains(github.event.comment.body, '/fast-forward') &&
+      github.event.issue.pull_request &&
+      github.base_ref == 'develop'
     runs-on: ubuntu-latest
 
     permissions:
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 33eccb4..29d3662 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -1,7 +1,9 @@
 name: pull-request
 on:
   pull_request:
-    types: [opened, reopened, synchronize]
+    branches:
+      - develop
+    types: [ opened, reopened, synchronize ]
 jobs:
   check-fast-forward:
     runs-on: ubuntu-latest