diff --git a/apertis-ostree-commit.yaml b/apertis-ostree-commit.yaml
index 31b8264131866eec4b9345337ee045d7046968ad..f03d6d82d7cc60baf42401fb11d3760af8e22bc5 100644
--- a/apertis-ostree-commit.yaml
+++ b/apertis-ostree-commit.yaml
@@ -80,6 +80,12 @@ actions:
     description: "Empty /etc/machine-id so it's regenerated on first boot with an unique value"
     command: truncate -s0 "${ROOTDIR}/etc/machine-id"
 
+  # work around the Debos isssue in https://phabricator.apertis.org/T4308
+  - action: run
+    chroot: false
+    description: "Drop resolv.conf so the appropriate one gets created at runtime"
+    command: rm "${ROOTDIR}/etc/resolv.conf"
+
   - action: run
     chroot: false
     script: scripts/ostree-convert-from-debian
diff --git a/apertis-ostree-image-uboot.yaml b/apertis-ostree-image-uboot.yaml
index cb0a7da7fb7863de159bebad404053b7eb38da5c..1d6f72801ac2cd86e85bb6975a59e4aea593bde1 100644
--- a/apertis-ostree-image-uboot.yaml
+++ b/apertis-ostree-image-uboot.yaml
@@ -75,12 +75,6 @@ actions:
     origin: mediademo
   {{ end }}
 
-  # work around the Debos isssue in https://phabricator.apertis.org/T4308
-  - action: run
-    chroot: false
-    description: "Drop resolv.conf so the appropriate one gets created at runtime"
-    command: rm "${ROOTDIR}/etc/resolv.conf"
-
   - action: run
     description: List files on {{ $image }}
     chroot: false
diff --git a/apertis-ostree-image-uefi.yaml b/apertis-ostree-image-uefi.yaml
index 2ae4ffd40c17f3a4b060c9876e2e8a7ebaa589c8..c1abb485f9847ee9a88fe367b9f1f53536048916 100644
--- a/apertis-ostree-image-uefi.yaml
+++ b/apertis-ostree-image-uefi.yaml
@@ -80,12 +80,6 @@ actions:
     chroot: false
     script: scripts/setup-uefi-bootloader.sh {{ $osname }}
 
-  # work around the Debos isssue in https://phabricator.apertis.org/T4308
-  - action: run
-    chroot: false
-    description: "Drop resolv.conf so the appropriate one gets created at runtime"
-    command: rm "${ROOTDIR}/etc/resolv.conf"
-
   - action: run
     description: List files on {{ $image }}
     chroot: false