diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 76a7cf4487..b3aaa939e5 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -3357,15 +3357,15 @@ function setup_vxlan_network {
 }
 
 function downgrade_dnsmasq {
-    # NOTE(TheJulia): The intent here is to downgrade dnsmasq to the version
-    # shipped with Ubuntu focal, so we can have stable CI.
-    # https://bugs.launchpad.net/ubuntu/+source/dnsmasq/+bug/2026757
-    wget http://archive.ubuntu.com/ubuntu/pool/main/d/dnsmasq/dnsmasq-base_2.80-1.1ubuntu1.7_amd64.deb
-    wget http://archive.ubuntu.com/ubuntu/pool/main/libi/libidn/libidn11_1.33-2.2ubuntu2_amd64.deb
-    wget http://archive.ubuntu.com/ubuntu/pool/main/n/nettle/libhogweed5_3.5.1+really3.5.1-2ubuntu0.2_amd64.deb
-    wget http://archive.ubuntu.com/ubuntu/pool/main/n/nettle/libnettle7_3.5.1+really3.5.1-2ubuntu0.2_amd64.deb
-    sudo dpkg -i dnsmasq-base_2.80-1.1ubuntu1.7_amd64.deb libidn11_1.33-2.2ubuntu2_amd64.deb libhogweed5_3.5.1+really3.5.1-2ubuntu0.2_amd64.deb  libnettle7_3.5.1+really3.5.1-2ubuntu0.2_amd64.deb || true
-    rm *.deb
+    # NOTE(TheJulia): The intent here is to use dnsmasq version
+    # which does not crash on segfaults or sigabort when configuration
+    # is updated. See https://bugs.launchpad.net/ironic/+bug/2026757
+    sudo dpkg -r dnsmasq-base
+    git clone http://thekelleys.org.uk/git/dnsmasq.git -b v2.85 --depth 1
+    pushd dnsmasq
+    sed -i 's|^PREFIX.*|PREFIX = /usr|' Makefile
+    sudo make install
+    popd
 }
 
 # Restore xtrace + pipefail