diff --git a/tasks/yum_install_buildah.yml b/tasks/yum_install_buildah.yml
index c7e403b..4e140f3 100644
--- a/tasks/yum_install_buildah.yml
+++ b/tasks/yum_install_buildah.yml
@@ -76,10 +76,12 @@
     path: "{{ yum_install.path }}"
     state: absent
 
+# NOTE(aschultz): remove --format docker when oci images are properly supported
 - name: Commit changes to image
         ({{ target_image | default(source_image) }}{{ modified_append_tag }})
   command: >
     buildah commit
+      --format docker
       {{ from_image }}
       {{ target_image | default(source_image) }}{{ modified_append_tag }}
 
diff --git a/tasks/yum_update_buildah.yml b/tasks/yum_update_buildah.yml
index 6aa5759..7511bd3 100644
--- a/tasks/yum_update_buildah.yml
+++ b/tasks/yum_update_buildah.yml
@@ -142,10 +142,12 @@
     path: "{{ yum_update.path }}"
     state: absent
 
+# NOTE(aschultz): remove --format docker when oci images are properly supported
 - name: Commit changes to image
         ({{ target_image | default(source_image) }}{{ modified_append_tag }})
   command: >
     buildah commit
+      --format docker
       {{ from_image }}
       {{ target_image | default(source_image) }}{{ modified_append_tag }}
 
diff --git a/vars/main.yml b/vars/main.yml
index 3d0b87d..44af6c1 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,5 +1,6 @@
 ---
+# NOTE(aschultz): remove --format docker when oci images are properly supported
 # we support 'docker' or 'buildah'
 build_commands:
   docker: docker build
-  buildah: buildah bud
+  buildah: buildah bud --format docker