diff --git a/.github/workflows/kics.yml b/.github/workflows/kics.yml
index 4abe9e7e..de93a1eb 100644
--- a/.github/workflows/kics.yml
+++ b/.github/workflows/kics.yml
@@ -13,9 +13,6 @@ on:
           - warning
           - debug
   pull_request:
-  push:
-    branches:
-      - 'main'
   merge_group:
   schedule:
     - cron: '15 6 * * 4'
diff --git a/.github/workflows/test_linting.yml b/.github/workflows/test_linting.yml
index b13fb8fb..c8c1497e 100644
--- a/.github/workflows/test_linting.yml
+++ b/.github/workflows/test_linting.yml
@@ -17,12 +17,10 @@ on:
       rolename:
         required: true
         type: string
-  pull_request:
-    branches:
-      - '*'
 
 jobs:
   lint:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase.
diff --git a/.github/workflows/test_plugins.yml b/.github/workflows/test_plugins.yml
index 201e56af..c043865d 100644
--- a/.github/workflows/test_plugins.yml
+++ b/.github/workflows/test_plugins.yml
@@ -13,8 +13,6 @@ on:
           - warning
           - debug
   pull_request:
-    branches:
-      - 'main'
     paths:
       - 'plugins/**'
       - 'tests/**'
@@ -66,6 +64,7 @@ jobs:
           ANSIBLE_FORCE_COLOR: '1'
 
   sanity_ansible_20:
+    if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     env:
       COLLECTION_NAMESPACE: netways
diff --git a/.github/workflows/test_role_beats.yml b/.github/workflows/test_role_beats.yml
index 6f372bc4..6db949e2 100644
--- a/.github/workflows/test_role_beats.yml
+++ b/.github/workflows/test_role_beats.yml
@@ -13,10 +13,6 @@ on:
           - warning
           - debug
   pull_request:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
     paths:
       - 'roles/beats/**'
       - '.github/workflows/test_role_beats.yml'
diff --git a/.github/workflows/test_role_elasticsearch.yml b/.github/workflows/test_role_elasticsearch.yml
index d7f495e3..af73ecc3 100644
--- a/.github/workflows/test_role_elasticsearch.yml
+++ b/.github/workflows/test_role_elasticsearch.yml
@@ -13,10 +13,6 @@ on:
           - warning
           - debug
   pull_request:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
     paths:
       - 'roles/elasticsearch/**'
       - '.github/workflows/test_role_elasticsearch.yml'
diff --git a/.github/workflows/test_role_kibana.yml b/.github/workflows/test_role_kibana.yml
index 9dc56687..dd11e841 100644
--- a/.github/workflows/test_role_kibana.yml
+++ b/.github/workflows/test_role_kibana.yml
@@ -13,10 +13,6 @@ on:
           - warning
           - debug
   pull_request:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
     paths:
       - 'roles/kibana/**'
       - '.github/workflows/test_role_kibana.yml'
@@ -35,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      COLLECTION_NAMESPACE: NETWAYS
+      COLLECTION_NAMESPACE: netways
       COLLECTION_NAME: elasticstack
 
     strategy:
diff --git a/.github/workflows/test_role_logstash.yml b/.github/workflows/test_role_logstash.yml
index 2746f398..9f133ed0 100644
--- a/.github/workflows/test_role_logstash.yml
+++ b/.github/workflows/test_role_logstash.yml
@@ -13,10 +13,6 @@ on:
           - warning
           - debug
   pull_request:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
     paths:
       - 'roles/logstash/**'
       - '.github/workflows/test_role_logstash.yml'
diff --git a/.github/workflows/test_role_repos.yml b/.github/workflows/test_role_repos.yml
index b2c714be..4b9a4bae 100644
--- a/.github/workflows/test_role_repos.yml
+++ b/.github/workflows/test_role_repos.yml
@@ -12,10 +12,6 @@ on:
           - warning
           - debug
   pull_request:
-    branches:
-      - 'feature/**'
-      - 'fix/**'
-      - '!doc/**'
     paths:
       - 'roles/repos/**'
       - '.github/workflows/test_role_repos.yml'
diff --git a/.github/workflows/test_roles_pr.yml b/.github/workflows/test_roles_pr.yml
index 367de435..b7438c97 100644
--- a/.github/workflows/test_roles_pr.yml
+++ b/.github/workflows/test_roles_pr.yml
@@ -13,6 +13,14 @@ on:
           - warning
           - debug
   pull_request:
+    paths:
+      - 'roles/**'
+      - 'molecule/elasticstack_default/**'
+      - 'requirements-test.txt'
+      - '.yamllint'
+      - '.config/ansible-lint.yml'
+      - 'galaxy.yml'
+      - '.github/workflows/test_roles_pr.yml'
   merge_group:
 
 jobs:
diff --git a/README.md b/README.md
index 494ed9dd..e1bfcd67 100644
--- a/README.md
+++ b/README.md
@@ -221,12 +221,6 @@ The execution order of the roles is important! (see below)
 
 Every kind of contribution is very welcome. Open [issues](https://github.com/NETWAYS/ansible-collection-elasticstack/issues) or provide [pull requests](https://github.com/NETWAYS/ansible-collection-elasticstack/pulls).
 
-Please note that we have some actions bound to specific names of branches. So please stick to the following naming scheme:
-
-* `fix/` as a prefix for every branch that fixes a problem
-* `feature/` for every branch that enhances the code with new features
-* `doc/` as a prefix for every branch that only changes documentation
-
 For now we open pull requests against `main`. We are planning to introduce dedicated branches to support older versions without breaking changes. Since we don't need them for now, please check back with this section because when we decided on how to proceed, you will find the information here. For now `main` always has the newest changes and if you want a stable version, please use the newest release.
 
 ## Testing