diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index a24f296b..86da69f8 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -127,7 +127,7 @@ show_setup_menu() {
   local options="  Audio\n  Wifi\n󰂯  Bluetooth\n󱐋  Power Profile\n󰍹  Monitors"
   [ -f ~/.config/hypr/bindings.conf ] && options="$options\n  Keybindings"
   [ -f ~/.config/hypr/input.conf ] && options="$options\n  Input"
-  options="$options\n  Config\n󰈷  Fingerprint\n  Fido2"
+  options="$options\n󰱔  DNS\n  Config\n󰈷  Fingerprint\n  Fido2"
 
   case $(menu "Setup" "$options") in
   *Audio*) alacritty --class=Wiremix -e wiremix ;;
@@ -143,6 +143,7 @@ show_setup_menu() {
   *Monitors*) edit_in_nvim ~/.config/hypr/monitors.conf ;;
   *Keybindings*) edit_in_nvim ~/.config/hypr/bindings.conf ;;
   *Input*) edit_in_nvim ~/.config/hypr/input.conf ;;
+  *DNS*) present_terminal omarchy-setup-dns ;;
   *Config*) show_setup_config_menu ;;
   *Fingerprint*) present_terminal omarchy-setup-fingerprint ;;
   *Fido2*) present_terminal omarchy-setup-fido2 ;;
diff --git a/bin/omarchy-setup-dns b/bin/omarchy-setup-dns
new file mode 100755
index 00000000..aa1924c1
--- /dev/null
+++ b/bin/omarchy-setup-dns
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+if [[ -z $1 ]]; then
+  dns=$(gum choose --height 5 --header "Select DNS provider" Cloudflare DHCP Custom)
+else
+  dns=$1
+fi
+
+case "$dns" in
+Cloudflare)
+  sudo tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
+[Resolve]
+DNS=1.1.1.1#cloudflare-dns.com 1.0.0.1#cloudflare-dns.com
+FallbackDNS=8.8.8.8#dns.google 8.8.4.4#dns.google
+DNSOverTLS=opportunistic
+EOF
+  sudo systemctl restart systemd-resolved
+  ;;
+
+DHCP)
+  sudo tee /etc/systemd/resolved.conf >/dev/null <<'EOF'
+[Resolve]
+DNS=
+FallbackDNS=
+DNSOverTLS=no
+EOF
+  sudo systemctl restart systemd-resolved
+  ;;
+
+Custom)
+  echo "Enter your DNS servers (space-separated, e.g. '192.168.1.1 1.1.1.1'):"
+  read -r dns_servers
+
+  if [[ -z "$dns_servers" ]]; then
+    echo "Error: No DNS servers provided."
+    exit 1
+  fi
+
+  sudo tee /etc/systemd/resolved.conf >/dev/null <<EOF
+[Resolve]
+DNS=$dns_servers
+FallbackDNS=1.1.1.1 8.8.8.8
+EOF
+  sudo systemctl restart systemd-resolved
+
+  ;;
+esac
+
diff --git a/migrations/1755109182.sh b/migrations/1755109182.sh
new file mode 100755
index 00000000..352e342a
--- /dev/null
+++ b/migrations/1755109182.sh
@@ -0,0 +1,32 @@
+echo "Reset DNS configuration to DHCP (remove forced Cloudflare DNS)"
+
+# Reset DNS to use DHCP by default instead of forcing Cloudflare
+# This preserves local development environments (.local domains, etc.)
+# Users can still opt-in to Cloudflare DNS using: omarchy-setup-dns cloudflare
+
+if [ -f /etc/systemd/resolved.conf ]; then
+  # Backup current config with timestamp
+  backup_timestamp=$(date +"%Y%m%d%H%M%S")
+  sudo cp /etc/systemd/resolved.conf "/etc/systemd/resolved.conf.bak.${backup_timestamp}"
+
+  # Remove explicit DNS entries to use DHCP
+  sudo sed -i '/^DNS=/d' /etc/systemd/resolved.conf
+  sudo sed -i '/^FallbackDNS=/d' /etc/systemd/resolved.conf
+
+  # Add empty DNS entries to ensure DHCP is used
+  echo "DNS=" | sudo tee -a /etc/systemd/resolved.conf >/dev/null
+  echo "FallbackDNS=" | sudo tee -a /etc/systemd/resolved.conf >/dev/null
+
+  # Remove any forced DNS config from systemd-networkd
+  if [ -f /etc/systemd/network/99-omarchy-dns.network ]; then
+    sudo rm -f /etc/systemd/network/99-omarchy-dns.network
+    sudo systemctl restart systemd-networkd
+  fi
+
+  # Restart systemd-resolved to apply changes
+  sudo systemctl restart systemd-resolved
+
+  echo "DNS configuration reset to use DHCP (router DNS)"
+  echo "To use Cloudflare DNS, run: omarchy-setup-dns Cloudflare"
+fi
+