diff --git a/board/common/post-build.sh b/board/common/post-build.sh
index af6b02a5..fcda4e70 100755
--- a/board/common/post-build.sh
+++ b/board/common/post-build.sh
@@ -15,14 +15,3 @@ rm "$TARGET_DIR/etc/os-release"
 } > "$TARGET_DIR/etc/os-release"
 
 echo "Infix by KernelKit $GIT_VERSION -- $(date +"%b %e %H:%M %Z %Y")" > "$TARGET_DIR/etc/version"
-
-if [ -f "$TARGET_DIR/etc/dhcpcd.conf" ]; then
-	if grep -vq background  "$TARGET_DIR/etc/dhcpcd.conf"; then
-		cat <<-EOF >> "$TARGET_DIR/etc/dhcpcd.conf"
-		
-		# Background immediately, do not wait for DHCP lease (speed up boot process)
-		background
-		
-		EOF
-	fi
-fi
diff --git a/board/common/rootfs/etc/dhcpcd.conf b/board/common/rootfs/etc/dhcpcd.conf
new file mode 100644
index 00000000..8a1da325
--- /dev/null
+++ b/board/common/rootfs/etc/dhcpcd.conf
@@ -0,0 +1,51 @@
+# Infix's configuration for dhcpcd.
+# See dhcpcd.conf(5) for details.
+
+# Allow users of this group to interact with dhcpcd via the control socket.
+#controlgroup wheel
+
+# Inform the DHCP server of our hostname for DDNS.
+#hostname
+
+# Use the hardware address of the interface for the Client ID.
+#clientid
+# or
+# Use the same DUID + IAID as set in DHCPv6 for DHCPv4 ClientID as per RFC4361.
+# Some non-RFC compliant DHCP servers do not reply with this set.
+# In this case, comment out duid and enable clientid above.
+duid
+
+# Persist interface configuration when dhcpcd exits.
+persistent
+
+# vendorclassid is set to blank to avoid sending the default of
+# dhcpcd-<version>:<os>:<machine>:<platform>
+vendorclassid
+
+# A list of options to request from the DHCP server.
+option domain_name_servers, domain_name, domain_search
+option classless_static_routes
+# Respect the network MTU. This is applied to DHCP routes.
+option interface_mtu
+
+# Request a hostname from the network
+option host_name
+
+# Most distributions have NTP support.
+#option ntp_servers
+
+# Rapid commit support.
+# Safe to enable by default because it requires the equivalent option set
+# on the server to actually work.
+option rapid_commit
+
+# A ServerID is required by RFC2131.
+require dhcp_server_identifier
+
+# Generate SLAAC address using the Hardware Address of the interface
+#slaac hwaddr
+# OR generate Stable Private IPv6 Addresses based from the DUID
+slaac private
+
+# Background immediately, do not wait for DHCP lease (speed up boot process)
+background