diff --git a/infra/image/system-service/fixipaip.sh b/infra/image/system-service/fixipaip.sh
index f7053e0292334e6861244034cfa88f2b87215fde..ed11a2b6a4a36c8f88f15926f139c2170d2a4235 100755
--- a/infra/image/system-service/fixipaip.sh
+++ b/infra/image/system-service/fixipaip.sh
@@ -73,16 +73,16 @@ for zone in ${ZONES}; do
             echo "ERROR: Failed to get old PTR from '${zone}': '${OLD_PTR}'"
         else
             ipa dnsrecord-mod "${zone}" "${OLD_PTR}" --ptr-rec="${HOSTNAME}." \
-                --rename="${PTR}"
+                --rename="${PTR}" || true
         fi
     else
         echo "Fixing forward zone ${zone}:"
-        ipa dnsrecord-mod test.local "${HOSTNAME%%.*}" --a-rec="$IP"
-        ipa dnsrecord-mod test.local ipa-ca --a-rec="$IP"
+        ipa dnsrecord-mod test.local "${HOSTNAME%%.*}" --a-rec="$IP" || true
+        ipa dnsrecord-mod test.local ipa-ca --a-rec="$IP" || true
     fi
 done
 
-ipa dnsserver-mod "${HOSTNAME}" --forwarder="${FORWARDER}"
+ipa dnsserver-mod "${HOSTNAME}" --forwarder="${FORWARDER}" || true
 
 kdestroy -c "${KRB5CCNAME}" -A