diff --git a/root_resources/etc/resolv.conf b/root_resources/etc/resolv.conf
deleted file mode 100755
index 08aa680..0000000
--- a/root_resources/etc/resolv.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# {{ ansible_managed }}
-
-search {{ domain_name }}
-nameserver 192.168.1.254
-
-# Google Public DNS
-nameserver 8.8.8.8
diff --git a/root_resources/etc/systemd/resolved.conf b/root_resources/etc/systemd/resolved.conf
new file mode 100644
index 0000000..28f6bf5
--- /dev/null
+++ b/root_resources/etc/systemd/resolved.conf
@@ -0,0 +1,35 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it under the
+#  terms of the GNU Lesser General Public License as published by the Free
+#  Software Foundation; either version 2.1 of the License, or (at your option)
+#  any later version.
+#
+# Entries in this file show the compile time defaults. Local configuration
+# should be created by either modifying this file, or by creating "drop-ins" in
+# the resolved.conf.d/ subdirectory. The latter is generally recommended.
+# Defaults can be restored by simply deleting this file and all drop-ins.
+#
+# Use 'systemd-analyze cat-config systemd/resolved.conf' to display the full config.
+#
+# See resolved.conf(5) for details.
+
+[Resolve]
+DNS=1.1.1.1 8.8.8.8
+# Some examples of DNS servers which may be used for DNS= and FallbackDNS=:
+# Cloudflare: 1.1.1.1#cloudflare-dns.com 1.0.0.1#cloudflare-dns.com 2606:4700:4700::1111#cloudflare-dns.com 2606:4700:4700::1001#cloudflare-dns.com
+# Google:     8.8.8.8#dns.google 8.8.4.4#dns.google 2001:4860:4860::8888#dns.google 2001:4860:4860::8844#dns.google
+# Quad9:      9.9.9.9#dns.quad9.net 149.112.112.112#dns.quad9.net 2620:fe::fe#dns.quad9.net 2620:fe::9#dns.quad9.net
+#DNS=
+#FallbackDNS=
+#Domains=
+#DNSSEC=no
+#DNSOverTLS=no
+#MulticastDNS=yes
+#LLMNR=yes
+#Cache=yes
+#CacheFromLocalhost=no
+#DNSStubListener=yes
+#DNSStubListenerExtra=
+#ReadEtcHosts=yes
+#ResolveUnicastSingleLabel=no
diff --git a/server-setup.yml b/server-setup.yml
index 9c20b0e..9660fb3 100755
--- a/server-setup.yml
+++ b/server-setup.yml
@@ -91,13 +91,6 @@
         - spark_ansible-editvault.sh
         - spark_ansible-viewvault.sh
 
-    # DNS Config
-    - name: Ensure DNS configuration is updated
-      become: yes
-      template:
-        src: root_resources/etc/resolv.conf
-        dest: "/etc/resolv.conf"
-
    # Package Config
     - name: Ensure list of packages is installed
       become: yes
@@ -113,6 +106,13 @@
         enabled: yes
         state: started
 
+    # DNS Config
+    - name: Ensure Systemd Resolved DNS configuration is updated
+      become: yes
+      template:
+        src: root_resources/etc/resolv.conf
+        dest: "/etc/resolv.conf"
+
     - name: Ensure USB key mountpoint exists
       become: yes
       ansible.builtin.file: