diff --git a/roles/tripleo_container_image_prepare_default/defaults/main.yml b/roles/tripleo_container_image_prepare_default/defaults/main.yml
index eb87ccf..24ca8fa 100644
--- a/roles/tripleo_container_image_prepare_default/defaults/main.yml
+++ b/roles/tripleo_container_image_prepare_default/defaults/main.yml
@@ -1,13 +1,6 @@
 ---
-# defaults file for tripleo-container-image-push
-tripleo_container_image_push_append_tag:
-tripleo_container_image_push_become: true
-tripleo_container_image_push_cleanup: false
-tripleo_container_image_push_debug: false
-tripleo_container_image_push_dry_run: false
-tripleo_container_image_push_local: false
-tripleo_container_image_push_multi_arch: false
-tripleo_container_image_push_password:
-tripleo_container_image_push_registry_url:
-tripleo_container_image_push_timeout: 360
-tripleo_container_image_push_username:
+# defaults file for tripleo_container_image_prepare_default
+openstack_bin: openstack
+tripleo_container_image_prepare_default_debug: false
+tripleo_container_image_prepare_default_local_push_destination: false
+tripleo_container_image_prepare_default_output_env_file:
diff --git a/roles/tripleo_container_image_prepare_default/molecule/default/converge.yml b/roles/tripleo_container_image_prepare_default/molecule/default/converge.yml
new file mode 100644
index 0000000..0ed454c
--- /dev/null
+++ b/roles/tripleo_container_image_prepare_default/molecule/default/converge.yml
@@ -0,0 +1,42 @@
+---
+- name: Converge
+  hosts: all
+  collections:
+    - tripleo.operator
+  vars:
+    openstack_bin: echo
+    tripleo_container_image_prepare_default_debug: true
+  tasks:
+
+    - name: "Include tripleo_container_image_prepare_default"
+      include_role:
+        name: "tripleo_container_image_prepare_default"
+
+    - name: Check role
+      assert:
+        that:
+          - tripleo_container_image_prepare_default_output == "tripleo container image prepare default"
+
+    - name: Check parameter "tripleo_container_image_prepare_default_output_env_file"
+      include_role:
+        name: "tripleo_container_image_prepare_default"
+      vars:
+        tripleo_container_image_prepare_default_output_env_file: /tmp/foo.yaml
+
+    - name: Assert "tripleo_container_image_prepare_default_output_env_file"
+      assert:
+        that:
+          - tripleo_container_image_prepare_default_output ==
+            "tripleo container image prepare default --output-env-file /tmp/foo.yaml"
+
+    - name: Check parameter "tripleo_container_image_prepare_default_local_push_destination"
+      include_role:
+        name: "tripleo_container_image_prepare_default"
+      vars:
+        tripleo_container_image_prepare_default_local_push_destination: true
+
+    - name: Assert "tripleo_container_image_prepare_default_output_env_file"
+      assert:
+        that:
+          - tripleo_container_image_prepare_default_output ==
+            "tripleo container image prepare default --local-push-destination"
diff --git a/roles/tripleo_container_image_prepare_default/molecule/default/molecule.yml b/roles/tripleo_container_image_prepare_default/molecule/default/molecule.yml
new file mode 100644
index 0000000..2841806
--- /dev/null
+++ b/roles/tripleo_container_image_prepare_default/molecule/default/molecule.yml
@@ -0,0 +1,19 @@
+---
+driver:
+  name: delegated
+  options:
+    managed: false
+    ansible_connection_options:
+      ansible_connection: local
+log: true
+platforms:
+  - name: instance
+provisioner:
+  name: ansible
+scenario:
+  name: default
+  test_sequence:
+    - prepare
+    - syntax
+    - converge
+    - verify
diff --git a/roles/tripleo_container_image_prepare_default/molecule/default/prepare.yml b/roles/tripleo_container_image_prepare_default/molecule/default/prepare.yml
new file mode 100644
index 0000000..63bb6ab
--- /dev/null
+++ b/roles/tripleo_container_image_prepare_default/molecule/default/prepare.yml
@@ -0,0 +1,8 @@
+---
+- name: Prepare
+  hosts: all
+  tasks:
+
+    - name: Include molecule prep
+      include_role:
+        name: test_molecule_prep
diff --git a/roles/tripleo_container_image_prepare_default/tasks/main.yml b/roles/tripleo_container_image_prepare_default/tasks/main.yml
index 7b8c3b2..354a303 100644
--- a/roles/tripleo_container_image_prepare_default/tasks/main.yml
+++ b/roles/tripleo_container_image_prepare_default/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Setup container image prepare default facts
   set_fact:
     _prepare_cmd: >-
-      openstack tripleo container image prepare default
+      {{ openstack_bin }} tripleo container image prepare default
       {{ tripleo_container_image_prepare_default_output_env_file | ternary('--output-env-file '
       ~ tripleo_container_image_prepare_default_output_env_file, '') }}
       {{ tripleo_container_image_prepare_default_local_push_destination | ternary('--local-push-destination', '') }}
@@ -20,4 +20,4 @@
 
 - name: Set output variable
   set_fact:
-    tripleo_container_image_prepare_default_result: "{{ tripleo_container_image_prepare_default_result.stdout }}"
+    tripleo_container_image_prepare_default_output: "{{ tripleo_container_image_prepare_default_result.stdout }}"
diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml
index 770622b..aae2f81 100644
--- a/zuul.d/molecule.yaml
+++ b/zuul.d/molecule.yaml
@@ -7,6 +7,7 @@
       - tripleo-operator-molecule-tripleo_container_image_delete
       - tripleo-operator-molecule-tripleo_container_image_list
       - tripleo-operator-molecule-tripleo_container_image_prepare
+      - tripleo-operator-molecule-tripleo_container_image_prepare_default
       - tripleo-operator-molecule-tripleo_container_image_push
       - tripleo-operator-molecule-tripleo_container_image_show
       - tripleo-operator-molecule-tripleo_deploy
@@ -29,6 +30,7 @@
       - tripleo-operator-molecule-tripleo_container_image_delete
       - tripleo-operator-molecule-tripleo_container_image_list
       - tripleo-operator-molecule-tripleo_container_image_prepare
+      - tripleo-operator-molecule-tripleo_container_image_prepare_default
       - tripleo-operator-molecule-tripleo_container_image_push
       - tripleo-operator-molecule-tripleo_container_image_show
       - tripleo-operator-molecule-tripleo_deploy
@@ -165,6 +167,14 @@
     vars:
       tox_extra_args: tripleo_container_image_prepare
 
+- job:
+    files:
+      - ^roles/tripleo_container_image_prepare_default/.*
+    name: tripleo-operator-molecule-tripleo_container_image_prepare_default
+    parent: tripleo-operator-molecule-base
+    vars:
+      tox_extra_args: tripleo_container_image_prepare_default
+
 - job:
     files:
       - ^roles/tripleo_undercloud_backup/.*