diff -Nru ubuntu-settings-21.04.2/data/raspberrypi/10-raspi-eth0.link ubuntu-settings-21.04.3/data/raspberrypi/10-raspi-eth0.link
--- ubuntu-settings-21.04.2/data/raspberrypi/10-raspi-eth0.link	1970-01-01 01:00:00.000000000 +0100
+++ ubuntu-settings-21.04.3/data/raspberrypi/10-raspi-eth0.link	2021-04-13 23:02:42.000000000 +0100
@@ -0,0 +1,6 @@
+[Match]
+Driver=bcmgenet smsc95xx lan78xx
+OriginalName=en*
+
+[Link]
+Name=eth0
diff -Nru ubuntu-settings-21.04.2/data/raspberrypi/10-rpi-ethernet-eth0.yaml ubuntu-settings-21.04.3/data/raspberrypi/10-rpi-ethernet-eth0.yaml
--- ubuntu-settings-21.04.2/data/raspberrypi/10-rpi-ethernet-eth0.yaml	2021-04-13 17:00:21.000000000 +0100
+++ ubuntu-settings-21.04.3/data/raspberrypi/10-rpi-ethernet-eth0.yaml	1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-network:
-  ethernets:
-    eth0:
-      # Rename the built-in ethernet device to "eth0"
-      match:
-        driver: bcmgenet smsc95xx lan78xx
-      set-name: eth0
-      dhcp4: true
-      optional: true
diff -Nru ubuntu-settings-21.04.2/data/raspberrypi/99-gpio.rules ubuntu-settings-21.04.3/data/raspberrypi/99-gpio.rules
--- ubuntu-settings-21.04.2/data/raspberrypi/99-gpio.rules	1970-01-01 01:00:00.000000000 +0100
+++ ubuntu-settings-21.04.3/data/raspberrypi/99-gpio.rules	2021-04-13 23:02:42.000000000 +0100
@@ -0,0 +1,4 @@
+SUBSYSTEM=="bcm2835-gpiomem", KERNEL=="gpiomem", GROUP="dialout", MODE="0660"
+SUBSYSTEM=="i2c-dev", KERNEL=="i2c*", GROUP="dialout", MODE="0660"
+SUBSYSTEM=="spidev", KERNEL=="spidev*", GROUP="dialout", MODE="0660"
+SUBSYSTEM=="gpio", KERNEL=="gpiochip*", GROUP="dialout", MODE="0660"
diff -Nru ubuntu-settings-21.04.2/data/raspberrypi/meson.build ubuntu-settings-21.04.3/data/raspberrypi/meson.build
--- ubuntu-settings-21.04.2/data/raspberrypi/meson.build	2021-04-13 17:00:21.000000000 +0100
+++ ubuntu-settings-21.04.3/data/raspberrypi/meson.build	2021-04-13 23:02:42.000000000 +0100
@@ -1,9 +1,10 @@
-etc = get_option('sysconfdir')
 var_lib = get_option('sharedstatedir')
 
-install_data('10-rpi-ethernet-eth0.yaml',
-             install_dir: etc / 'netplan')
+install_data('10-raspi-eth0.link',
+             install_dir: 'lib/systemd/network')
 install_data('ZZraspi-wifi-powersave-off.conf',
              install_dir: 'lib/NetworkManager/conf.d')
 install_data('disable-suspend.pkla',
              install_dir: var_lib / 'polkit-1/localauthority/10-vendor.d')
+install_data('99-gpio.rules',
+             install_dir: 'lib/udev/rules.d')
diff -Nru ubuntu-settings-21.04.2/debian/changelog ubuntu-settings-21.04.3/debian/changelog
--- ubuntu-settings-21.04.2/debian/changelog	2021-04-13 17:00:21.000000000 +0100
+++ ubuntu-settings-21.04.3/debian/changelog	2021-04-13 23:02:42.000000000 +0100
@@ -1,3 +1,15 @@
+ubuntu-settings (21.04.3) hirsute; urgency=medium
+
+  [ William 'jawn-smith' Wilson ]
+  * Adding 99-gpio.rules udev rules for Raspberry Pi GPIO functionality
+    (LP: #1923672)
+
+  [ Dave Jones ]
+  * Replace netplan eth0 renaming rules for raspi with networkd link unit
+    (LP: #1922266)
+
+ -- Dave Jones <dave.jones@canonical.com>  Tue, 13 Apr 2021 23:02:42 +0100
+
 ubuntu-settings (21.04.2) hirsute; urgency=medium
 
   * debian/ubuntu-raspi-settings.gsettings-override: Drop Gorilla wallpaper override.
diff -Nru ubuntu-settings-21.04.2/debian/control ubuntu-settings-21.04.3/debian/control
--- ubuntu-settings-21.04.2/debian/control	2021-04-13 17:00:21.000000000 +0100
+++ ubuntu-settings-21.04.3/debian/control	2021-04-13 23:02:42.000000000 +0100
@@ -25,5 +25,5 @@
 Architecture: all
 Depends: ${misc:Depends}
 Description: default settings for Rasperry Pi devices
-  This package contains some default settings that are specific to Rasperry Pi
-  devices.
+ This package contains some default settings that are specific to Rasperry Pi
+ devices.
diff -Nru ubuntu-settings-21.04.2/debian/ubuntu-raspi-settings.install ubuntu-settings-21.04.3/debian/ubuntu-raspi-settings.install
--- ubuntu-settings-21.04.2/debian/ubuntu-raspi-settings.install	2021-04-13 17:00:21.000000000 +0100
+++ ubuntu-settings-21.04.3/debian/ubuntu-raspi-settings.install	2021-04-13 23:02:42.000000000 +0100
@@ -1,3 +1,4 @@
-etc/netplan/10-rpi-ethernet-eth0.yaml
+usr/lib/systemd/network/10-raspi-eth0.link
 usr/lib/NetworkManager/conf.d/ZZraspi-wifi-powersave-off.conf
 var/lib/polkit-1/localauthority/10-vendor.d/disable-suspend.pkla
+usr/lib/udev/rules.d/99-gpio.rules