diff --git a/molecule/olympus/create.yml b/molecule/olympus/create.yml
index 88da29d..ca27428 100644
--- a/molecule/olympus/create.yml
+++ b/molecule/olympus/create.yml
@@ -6,6 +6,5 @@
   no_log: "{{ molecule_no_log }}"
   collections:
     - middleware_automation.eris
-  tasks:
-    - ansible.builtin.include_role:
-        name: eris_hera_create
+  roles:
+    - name: eris_hera_create
diff --git a/molecule/olympus/destroy.yml b/molecule/olympus/destroy.yml
index e2c2b66..8151c20 100644
--- a/molecule/olympus/destroy.yml
+++ b/molecule/olympus/destroy.yml
@@ -6,6 +6,5 @@
   no_log: "{{ molecule_no_log }}"
   collections:
     - middleware_automation.eris
-  tasks:
-    - ansible.builtin.include_role:
-        name: eris_hera_destroy
+  roles:
+    - name: eris_hera_destroy
diff --git a/roles/eris_hera_create/defaults/main.yml b/roles/eris_hera_create/defaults/main.yml
index 80b2337..18cf6e9 100644
--- a/roles/eris_hera_create/defaults/main.yml
+++ b/roles/eris_hera_create/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 hera_home: "{{ lookup('env', 'HERA_HOME') }}"
 hera_debug: "{{ lookup('env', 'HERA_DEBUG') | default(False) }}"
-podman_image: 'localhost/molecule-slave'
+podman_image: "{{ lookup('ansible.builtin.env', 'HERA_MOLECULE_SLAVE_IMAGE') | default('podman_image', 'localhost/molecule-slave-9') }}"
 hera_molecule_slave_sshd_port: "{{ lookup('env', 'BUILD_MOLECULE_SLAVE_SSHD_PORT') | default('undefined') }}"
 workdir: "{{ lookup('env', 'WORKDIR') }}"
 job_name: "{{ lookup('env', 'JOB_NAME') | default('ansible') }}-slave"