diff --git a/manifests/aarch64-drop-qcom-dtb-files.yaml b/manifests/aarch64-drop-qcom-dtb-files.yaml
new file mode 100644
index 0000000000..134dc51079
--- /dev/null
+++ b/manifests/aarch64-drop-qcom-dtb-files.yaml
@@ -0,0 +1,8 @@
+
+postprocess:
+  # Short term hack to avoid running out of space on aarch64. This should
+  # save us about 14M. https://github.com/coreos/fedora-coreos-tracker/issues/1464
+  - |
+    #!/usr/bin/env bash
+    set -xeuo pipefail
+    rm -vrf /usr/lib/modules/*aarch64/dtb/qcom/
diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
index 495439f49c..bf917f0d14 100644
--- a/manifests/fedora-coreos-base.yaml
+++ b/manifests/fedora-coreos-base.yaml
@@ -77,13 +77,6 @@ postprocess:
     ln -sf /usr/sbin/iptables-nft-restore  /etc/alternatives/iptables-restore
     ln -sf /usr/sbin/iptables-nft-save     /etc/alternatives/iptables-save
 
-  # Short term hack to avoid running out of space on aarch64. This should
-  # save us about 14M. https://github.com/coreos/fedora-coreos-tracker/issues/1464
-  - |
-    #!/usr/bin/env bash
-    set -xeuo pipefail
-    rm -vrf /usr/lib/modules/*aarch64/dtb/qcom/
-
   # Force the ssh-host-keys-migration to happen on every boot
   # to handle cases where someone did a upgrade->rollback->upgrade
   # See https://github.com/coreos/fedora-coreos-tracker/issues/1473
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index 6a0d1722c7..2d423ec13c 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -29,6 +29,17 @@ conditional-include:
     # https://github.com/coreos/fedora-coreos-tracker/issues/1247#issuecomment-1355314761
     # https://github.com/coreos/fedora-coreos-tracker/issues/1495#issuecomment-1561765705
     include: ostree-autoprune.yaml
+  - if:
+      - basearch == "aarch64"
+      - releasever >= 39
+    # Need OSTree autopruning on aarch64 until we stop removing the qcom dtb files
+    # as was done in https://github.com/coreos/fedora-coreos-tracker/issues/1464
+    include: ostree-autoprune.yaml
+  - if:
+      - basearch == "aarch64"
+      - releasever == 38
+    # Remove qcom dtb on F38 files since autopruning isn't in place yet
+    include: aarch64-drop-qcom-dtb-files.yaml
 
 ostree-layers:
   - overlay/15fcos