diff --git a/Containerfile b/Containerfile
index 0341637..8a744a2 100644
--- a/Containerfile
+++ b/Containerfile
@@ -14,5 +14,5 @@ set -xeuo pipefail
 # Cleanup
 /usr/share/doc/bootc-image-standard/stage-clean
 # And lint.
-bootc container lint
+bootc container lint --fatal-warnings
 EORUN
diff --git a/base/manifest.yaml b/base/manifest.yaml
index e1c31fa..f45e244 100644
--- a/base/manifest.yaml
+++ b/base/manifest.yaml
@@ -16,6 +16,7 @@ remove-from-packages:
 
 include:
   - postprocess-conf.yaml
+  - tmpfiles.yaml
   - bootc.yaml
   - bootupd.yaml
   - ostree.yaml
diff --git a/base/tmpfiles.yaml b/base/tmpfiles.yaml
new file mode 100644
index 0000000..d37ef7f
--- /dev/null
+++ b/base/tmpfiles.yaml
@@ -0,0 +1,7 @@
+postprocess:
+  - |
+    #!/bin/bash
+    cat >/usr/lib/tmpfiles.d/bootc-base-rpmstate.conf <<'EOF'
+    # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=771713
+    d /var/lib/rpm-state 0755 - - -
+    EOF
diff --git a/usr/lib/tmpfiles.d/bootc-legacy-contentsets.conf b/usr/lib/tmpfiles.d/bootc-legacy-contentsets.conf
new file mode 100644
index 0000000..25d21f7
--- /dev/null
+++ b/usr/lib/tmpfiles.d/bootc-legacy-contentsets.conf
@@ -0,0 +1,5 @@
+# Workaround for https://github.com/konflux-ci/build-tasks-dockerfiles/pull/243
+d /var/roothome/buildinfo 0755 - - -
+d /var/roothome/buildinfo/content_manifests 0755 - - -
+# Note we don't actually try to recreate the content; this just makes the linter ignore it
+f /var/roothome/buildinfo/content_manifests/content-sets.json 0644 - - -