diff --git a/bakery/templates/alpine-grub-efi/rugpi-bakery.toml b/bakery/templates/alpine-grub-efi/rugpi-bakery.toml
index e2844d6..8971d49 100644
--- a/bakery/templates/alpine-grub-efi/rugpi-bakery.toml
+++ b/bakery/templates/alpine-grub-efi/rugpi-bakery.toml
@@ -1,5 +1,5 @@
 [repositories]
-rugpi-extra = { git = "https://github.com/silitics/rugpi-extra.git", branch = "v0.6" }
+rugpi-extra = { git = "https://github.com/silitics/rugpi-extra.git", branch = "v0.7" }
 
 [images.customized-amd64]
 layer = "customized"
diff --git a/bakery/templates/debian-grub-efi/rugpi-bakery.toml b/bakery/templates/debian-grub-efi/rugpi-bakery.toml
index e2844d6..8971d49 100644
--- a/bakery/templates/debian-grub-efi/rugpi-bakery.toml
+++ b/bakery/templates/debian-grub-efi/rugpi-bakery.toml
@@ -1,5 +1,5 @@
 [repositories]
-rugpi-extra = { git = "https://github.com/silitics/rugpi-extra.git", branch = "v0.6" }
+rugpi-extra = { git = "https://github.com/silitics/rugpi-extra.git", branch = "v0.7" }
 
 [images.customized-amd64]
 layer = "customized"
diff --git a/bakery/templates/rpi-alpine/rugpi-bakery.toml b/bakery/templates/rpi-alpine/rugpi-bakery.toml
index e6323e2..ddf83ea 100644
--- a/bakery/templates/rpi-alpine/rugpi-bakery.toml
+++ b/bakery/templates/rpi-alpine/rugpi-bakery.toml
@@ -1,5 +1,5 @@
 [repositories]
-rugpi-extra = { git = "https://github.com/silitics/rugpi-extra.git", branch = "v0.6" }
+rugpi-extra = { git = "https://github.com/silitics/rugpi-extra.git", branch = "v0.7" }
 
 # Compatible with:
 # - Raspberry Pi 5
diff --git a/bakery/templates/rpi-debian/rugpi-bakery.toml b/bakery/templates/rpi-debian/rugpi-bakery.toml
index e6323e2..ddf83ea 100644
--- a/bakery/templates/rpi-debian/rugpi-bakery.toml
+++ b/bakery/templates/rpi-debian/rugpi-bakery.toml
@@ -1,5 +1,5 @@
 [repositories]
-rugpi-extra = { git = "https://github.com/silitics/rugpi-extra.git", branch = "v0.6" }
+rugpi-extra = { git = "https://github.com/silitics/rugpi-extra.git", branch = "v0.7" }
 
 # Compatible with:
 # - Raspberry Pi 5
diff --git a/bakery/templates/rpi-raspios/rugpi-bakery.toml b/bakery/templates/rpi-raspios/rugpi-bakery.toml
index e6323e2..ddf83ea 100644
--- a/bakery/templates/rpi-raspios/rugpi-bakery.toml
+++ b/bakery/templates/rpi-raspios/rugpi-bakery.toml
@@ -1,5 +1,5 @@
 [repositories]
-rugpi-extra = { git = "https://github.com/silitics/rugpi-extra.git", branch = "v0.6" }
+rugpi-extra = { git = "https://github.com/silitics/rugpi-extra.git", branch = "v0.7" }
 
 # Compatible with:
 # - Raspberry Pi 5