diff --git a/upstream/local.yml b/upstream/local.yml
index 261fd5128..04c2f9c69 100644
--- a/upstream/local.yml
+++ b/upstream/local.yml
@@ -59,7 +59,7 @@
         - always
       when: run_upstream|bool
 
-    - name: "Setting basic task variables"
+    - name: "Setting basic task variables (!)"
       set_fact:
         opm_cache_host_bug_line: 'RUN \["/bin/opm", "serve", "/configs", "--cache-dir=/tmp/cache", "--cache-only"\]'
         dc_changes_allowed:
diff --git a/upstream/roles/build_app_registry/tasks/main.yml b/upstream/roles/build_app_registry/tasks/main.yml
index 1dfd697c0..0f225daeb 100644
--- a/upstream/roles/build_app_registry/tasks/main.yml
+++ b/upstream/roles/build_app_registry/tasks/main.yml
@@ -58,8 +58,14 @@
 
 - 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: |
+        podman info
+        ls -la /var/tmp
+        df -h
+        podman system df
+        echo $TMPDIR
+        "{{ container_tool }} --tmpdir=/mnt/tmp build --no-cache --log-level=debug -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 }}"