diff --git a/extensions/molecule/default/create.yml b/extensions/molecule/default/create.yml
index 72c7604..137e2ca 100644
--- a/extensions/molecule/default/create.yml
+++ b/extensions/molecule/default/create.yml
@@ -47,6 +47,7 @@
                       - name: eqadmin
                         services:
                           - netbird
+                          - service2
       ansible.builtin.set_fact:
         molecule_inventory: >
           {{ molecule_inventory | combine(inventory_partial_yaml | from_yaml, recursive=true) }}
diff --git a/extensions/molecule/default/molecule.yml b/extensions/molecule/default/molecule.yml
index 797b6a7..56b3a5c 100644
--- a/extensions/molecule/default/molecule.yml
+++ b/extensions/molecule/default/molecule.yml
@@ -9,10 +9,11 @@ driver:
       ansible_connection: docker
 platforms:
   - name: instance
-    image: geerlingguy/docker-rockylinux9-ansible:latest
-    command: "/sbin/init"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-rockylinux9}-ansible:latest"
+    command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    cgroupns_mode: host
     privileged: true
     pre_build_image: true
     # you might want to add your own variables here based on what provisioning