diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 2e581449..e830bdea 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -6,7 +6,14 @@ on:
       - v*
     branches:
       - main
+      - 'feature/**'
+      - 'fix/**'
+      - '!doc/**'
   pull_request:
+    branches:
+      - 'feature/**'
+      - 'fix/**'
+      - '!doc/**'
 
 jobs:
   build:
@@ -20,7 +27,7 @@ jobs:
       max-parallel: 1
       matrix:
         distro: [ubuntu2204]
-        scenario: [default, cluster, cluster-oss, no-security, kibana_full_stack-oss]
+        scenario: [default, cluster, cluster-oss, no-security]
 
     steps:
       - name: Check out code
diff --git a/molecule/cluster-oss/requirements.yml b/molecule/cluster-oss/requirements.yml
deleted file mode 100644
index ed97d539..00000000
--- a/molecule/cluster-oss/requirements.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/molecule/kibana_full_stack-oss/molecule.yml b/molecule/kibana_full_stack-oss/molecule.yml
index f4585251..2e39979a 100644
--- a/molecule/kibana_full_stack-oss/molecule.yml
+++ b/molecule/kibana_full_stack-oss/molecule.yml
@@ -7,9 +7,11 @@ platforms:
   - name: kibana-full-oss
     groups:
       - elasticsearch
-      - kibana
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/molecule/no-security/converge.yml b/molecule/no-security/converge.yml
index d3812c2b..70361213 100644
--- a/molecule/no-security/converge.yml
+++ b/molecule/no-security/converge.yml
@@ -2,6 +2,8 @@
 # The workaround for arbitrarily named role directory is important because the git repo has one name and the role within it another
 # Found at: https://github.com/ansible-community/molecule/issues/1567#issuecomment-436876722
 - name: Converge
+  collections:
+    - NETWAYS.elasticstack
   hosts: all
   vars:
     elasticsearch_security: false
diff --git a/molecule/no-security/molecule.yml b/molecule/no-security/molecule.yml
index d82ee30f..f980152b 100644
--- a/molecule/no-security/molecule.yml
+++ b/molecule/no-security/molecule.yml
@@ -18,7 +18,3 @@ provisioner:
   name: ansible
 verifier:
   name: ansible
-lint: |
-  set -e
-  yamllint .
-  ansible-lint .
diff --git a/molecule/no-security/requirements.yml b/molecule/no-security/requirements.yml
deleted file mode 100644
index ed97d539..00000000
--- a/molecule/no-security/requirements.yml
+++ /dev/null
@@ -1 +0,0 @@
----