diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a83f9ea3..baaf0bea 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -112,4 +112,4 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       run: |
-        pytest -rs -s -vv
+        pytest -rs -s -vv --basetemp="${TMPDIR}/tmp"
diff --git a/plans/all.fmf b/plans/all.fmf
index 3fe08895..6be5ad3c 100644
--- a/plans/all.fmf
+++ b/plans/all.fmf
@@ -2,6 +2,10 @@ summary: Run all tests inside a VM environment
 provision:
   how: virtual
   image: fedora:39
+  # 120 means 120GB, disk has to be specificed here, the format from:
+  #   https://tmt.readthedocs.io/en/stable/spec/hardware.html#disk
+  # does not work here or below under "hardware"
+  disk: 120
   hardware:
     virtualization:
       is-supported: true
@@ -17,3 +21,6 @@ prepare:
 execute:
   how: tmt
   script: pytest -s -vv --force-aws-upload
+finish:
+  how: shell
+  script: df -h
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 00000000..ddcfaf12
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,4 @@
+[pytest]
+# do not use /tmp by default as it may be on a tempfs and our tests can
+# generate 10G images (that full of holes so not really 10G but still)
+addopts = --basetemp=/var/tmp
diff --git a/test/containerbuild.py b/test/containerbuild.py
index 96b24fc3..7a7f705c 100644
--- a/test/containerbuild.py
+++ b/test/containerbuild.py
@@ -24,5 +24,9 @@ def container_to_build_ref():
     # making "image_type" an "image" tuple (type, container_ref_to_test)
     return os.getenv(
         "BIB_TEST_BOOTC_CONTAINER_TAG",
-        "quay.io/centos-bootc/fedora-bootc:eln",
+        # using this tag instead of ":eln" until
+        #  https://github.com/CentOS/centos-bootc/issues/184 and
+        #  https://github.com/osbuild/bootc-image-builder/issues/149
+        # are fixed
+        "quay.io/centos-bootc/fedora-bootc:ed19452a30c50900be0b78db5f68d9826cc14a2e402f752535716cffd92b4445",
     )