diff --git a/upstream/roles/build_app_registry/defaults/main.yml b/upstream/roles/build_app_registry/defaults/main.yml
index c3e5d726a..977a0025f 100644
--- a/upstream/roles/build_app_registry/defaults/main.yml
+++ b/upstream/roles/build_app_registry/defaults/main.yml
@@ -3,6 +3,7 @@ testing_bin_path: "{{ work_dir }}/bin"
 opm_bin_path: "{{ testing_bin_path }}/opm"
 bundle_export_dir_app_registry: "{{ work_dir }}/app_registry/upstream-community-operators"
 container_tool: "docker"
+container_tool_extra_params: ""
 opm_container_tool: "docker"
 opm_container_tool_index: "docker"
 container_push_extra: ""
diff --git a/upstream/roles/build_app_registry/tasks/main.yml b/upstream/roles/build_app_registry/tasks/main.yml
index 1dfd697c0..9a7c1c313 100644
--- a/upstream/roles/build_app_registry/tasks/main.yml
+++ b/upstream/roles/build_app_registry/tasks/main.yml
@@ -58,8 +58,18 @@
 
 - name: "Building and pushing app registry"
   block:
-    - name: "Build app registry image '{{ app_registry_image }}' using '{{ app_registry_build_file }}'"
-      shell: "{{ container_tool }} build --no-cache -t {{ app_registry_image }} -f {{ app_registry_build_dir }}/{{ app_registry_build_file }} {{ bundle_export_dir_app_registry | dirname }}"
+    - name: "Build app registry image '{{ app_registry_image }}' using '{{ app_registry_build_file }}' (!)"
+      shell: |
+        cat <<__EOF__ >/usr/share/containers/storage.conf
+        [storage]
+        graphroot = "/mnt/storage"
+        driver = "overlay"
+        runroot = "/mnt/rundir"
+        __EOF__
+
+        {{ container_tool }} build {{ container_tool_extra_params }} --no-cache -t {{ app_registry_image }} -f {{ app_registry_build_dir }}/{{ app_registry_build_file }} {{ bundle_export_dir_app_registry | dirname }}
+    - name: next step
+      shell: "{{ container_tool }} build {{ container_tool_extra_params }} --no-cache -t {{ app_registry_image }} -f {{ app_registry_build_dir }}/{{ app_registry_build_file }} {{ bundle_export_dir_app_registry | dirname }}"
 
     - name: "Push app registry image '{{ app_registry_image }}'"
       shell: "{{ container_tool }} push {{ container_push_extra }} {{ app_registry_image }}"