diff -pruN 3.2-2/debian/changelog 3.2-3/debian/changelog
--- 3.2-2/debian/changelog	2025-04-27 16:58:53.000000000 +0000
+++ 3.2-3/debian/changelog	2025-08-10 16:10:34.000000000 +0000
@@ -1,3 +1,10 @@
+distrobuilder (3.2-3) unstable; urgency=medium
+
+  * Update Build-Depends
+    - Rebase d/p/001-fixup-imports.patch
+
+ -- Mathias Gibbens <gibmat@debian.org>  Sun, 10 Aug 2025 16:10:34 +0000
+
 distrobuilder (3.2-2) unstable; urgency=medium
 
   * d/control:
diff -pruN 3.2-2/debian/control 3.2-3/debian/control
--- 3.2-2/debian/control	2025-04-27 13:34:20.000000000 +0000
+++ 3.2-3/debian/control	2025-08-07 21:38:03.000000000 +0000
@@ -11,9 +11,9 @@ Build-Depends: debhelper-compat (= 13),
                squashfs-tools,
                golang-any,
                golang-github-antchfx-htmlquery-dev,
-               golang-github-flosch-pongo2.v4-dev,
+               golang-github-flosch-pongo2.v6-dev,
                golang-github-google-go-github-dev,
-               golang-github-lxc-incus-dev (>= 0.7),
+               golang-github-lxc-incus-dev (>= 6.0.4-3),
                golang-github-mudler-docker-companion-dev,
                golang-github-sirupsen-logrus-dev,
                golang-github-spf13-cobra-dev,
diff -pruN 3.2-2/debian/patches/001-fixup-imports.patch 3.2-3/debian/patches/001-fixup-imports.patch
--- 3.2-2/debian/patches/001-fixup-imports.patch	2025-04-04 11:36:52.000000000 +0000
+++ 3.2-3/debian/patches/001-fixup-imports.patch	2025-08-10 16:06:50.000000000 +0000
@@ -1,6 +1,58 @@
 From: Mathias Gibbens <gibmat@debian.org>
 Description: Adjust import paths for Debian packaging
 Forwarded: not-needed
+diff --git a/distrobuilder/main_repack-windows.go b/distrobuilder/main_repack-windows.go
+index bc526da..911265a 100644
+--- a/distrobuilder/main_repack-windows.go
++++ b/distrobuilder/main_repack-windows.go
+@@ -12,7 +12,7 @@ import (
+ 	"slices"
+ 	"strings"
+ 
+-	"github.com/flosch/pongo2/v4"
++	"github.com/flosch/pongo2"
+ 	incus "github.com/lxc/incus/v6/shared/util"
+ 	"github.com/sirupsen/logrus"
+ 	"github.com/spf13/cobra"
+diff --git a/generators/template.go b/generators/template.go
+index b688018..551138d 100644
+--- a/generators/template.go
++++ b/generators/template.go
+@@ -6,7 +6,7 @@ import (
+ 	"path/filepath"
+ 	"strings"
+ 
+-	"github.com/flosch/pongo2/v4"
++	"github.com/flosch/pongo2"
+ 	"github.com/lxc/incus/v6/shared/api"
+ 
+ 	"github.com/lxc/distrobuilder/image"
+diff --git a/shared/util.go b/shared/util.go
+index 46ea310..43cb7d3 100644
+--- a/shared/util.go
++++ b/shared/util.go
+@@ -14,7 +14,7 @@ import (
+ 	"strings"
+ 	"time"
+ 
+-	"github.com/flosch/pongo2/v4"
++	"github.com/flosch/pongo2"
+ 	"golang.org/x/sys/unix"
+ 	yaml "gopkg.in/yaml.v2"
+ )
+diff --git a/shared/util_test.go b/shared/util_test.go
+index 3699acc..0074815 100644
+--- a/shared/util_test.go
++++ b/shared/util_test.go
+@@ -7,7 +7,7 @@ import (
+ 	"slices"
+ 	"testing"
+ 
+-	"github.com/flosch/pongo2/v4"
++	"github.com/flosch/pongo2"
+ 	"github.com/stretchr/testify/require"
+ )
+ 
 diff --git a/sources/vyos-http.go b/sources/vyos-http.go
 index 02216a2..3ff34a2 100644
 --- a/sources/vyos-http.go
@@ -14,3 +66,16 @@ index 02216a2..3ff34a2 100644
  	"golang.org/x/sys/unix"
  
  	"github.com/lxc/distrobuilder/shared"
+diff --git a/windows/repack_util.go b/windows/repack_util.go
+index 798a5d2..32843e9 100644
+--- a/windows/repack_util.go
++++ b/windows/repack_util.go
+@@ -9,7 +9,7 @@ import (
+ 	"strconv"
+ 	"strings"
+ 
+-	"github.com/flosch/pongo2/v4"
++	"github.com/flosch/pongo2"
+ 	incus "github.com/lxc/incus/v6/shared/util"
+ 	"github.com/sirupsen/logrus"
+