diff -Nru linux-generate-hwe-6.5-6.5.0/debian/changelog linux-generate-hwe-6.5-6.5.0/debian/changelog
--- linux-generate-hwe-6.5-6.5.0/debian/changelog	2024-01-16 12:33:25.000000000 +0000
+++ linux-generate-hwe-6.5-6.5.0/debian/changelog	2024-02-07 10:01:46.000000000 +0000
@@ -1,3 +1,12 @@
+linux-generate-hwe-6.5 (6.5.0-18.18~22.04.1) jammy; urgency=medium
+
+  * Master version: 6.5.0-18.18~22.04.1
+
+  * Miscellaneous Ubuntu changes
+    - debian/tracking-bug -- update from master
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Wed, 07 Feb 2024 11:01:46 +0100
+
 linux-generate-hwe-6.5 (6.5.0-17.17~22.04.1) jammy; urgency=medium
 
   * Master version: 6.5.0-17.17~22.04.1
@@ -37,16 +46,3 @@
 
  -- Andrea Righi <andrea.righi@canonical.com>  Thu, 09 Nov 2023 14:42:32 +0200
 
-linux-generate-hwe-6.5 (6.5.0-12.12~22.04.1) jammy; urgency=medium
-
-  * Master version: 6.5.0-12.12~22.04.1
-
-  * Packaging resync (LP: #1786013)
-    - [Packaging] resync git-ubuntu-log
-    - [Packaging] update variants
-
-  * Miscellaneous Ubuntu changes
-    - debian/tracking-bug -- update from master
-
- -- Andrea Righi <andrea.righi@canonical.com>  Thu, 09 Nov 2023 13:21:21 +0200
-
diff -Nru linux-generate-hwe-6.5-6.5.0/debian/control linux-generate-hwe-6.5-6.5.0/debian/control
--- linux-generate-hwe-6.5-6.5.0/debian/control	2024-01-16 12:33:25.000000000 +0000
+++ linux-generate-hwe-6.5-6.5.0/debian/control	2024-02-07 10:01:46.000000000 +0000
@@ -8,12 +8,12 @@
  python3,
  python3-apt,
 Build-Depends-Arch:
- linux-image-unsigned-6.5.0-17-generic (= 6.5.0-17.17~22.04.1) [amd64 arm64 s390x],
- linux-buildinfo-6.5.0-17-generic (= 6.5.0-17.17~22.04.1) [amd64 arm64 s390x],
- linux-image-unsigned-6.5.0-17-generic-64k (= 6.5.0-17.17~22.04.1) [arm64],
- linux-buildinfo-6.5.0-17-generic-64k (= 6.5.0-17.17~22.04.1) [arm64],
+ linux-image-unsigned-6.5.0-18-generic (= 6.5.0-18.18~22.04.1) [amd64 arm64 s390x],
+ linux-buildinfo-6.5.0-18-generic (= 6.5.0-18.18~22.04.1) [amd64 arm64 s390x],
+ linux-image-unsigned-6.5.0-18-generic-64k (= 6.5.0-18.18~22.04.1) [arm64],
+ linux-buildinfo-6.5.0-18-generic-64k (= 6.5.0-18.18~22.04.1) [arm64],
  ubuntu-core-initramfs [amd64 arm64],
- linux-modules-extra-6.5.0-17-generic (= 6.5.0-17.17~22.04.1) [amd64 arm64] ,
+ linux-modules-extra-6.5.0-18-generic (= 6.5.0-18.18~22.04.1) [amd64 arm64] ,
  sbsigntool [amd64 arm64],
  openssl,
 Standards-Version: 3.9.4
diff -Nru linux-generate-hwe-6.5-6.5.0/debian/control.common linux-generate-hwe-6.5-6.5.0/debian/control.common
--- linux-generate-hwe-6.5-6.5.0/debian/control.common	2024-01-16 12:33:25.000000000 +0000
+++ linux-generate-hwe-6.5-6.5.0/debian/control.common	2024-02-07 10:01:46.000000000 +0000
@@ -8,12 +8,12 @@
  python3,
  python3-apt,
 Build-Depends-Arch:
- linux-image-unsigned-6.5.0-17-generic (= 6.5.0-17.17~22.04.1) [amd64 arm64 s390x],
- linux-buildinfo-6.5.0-17-generic (= 6.5.0-17.17~22.04.1) [amd64 arm64 s390x],
- linux-image-unsigned-6.5.0-17-generic-64k (= 6.5.0-17.17~22.04.1) [arm64],
- linux-buildinfo-6.5.0-17-generic-64k (= 6.5.0-17.17~22.04.1) [arm64],
+ linux-image-unsigned-6.5.0-18-generic (= 6.5.0-18.18~22.04.1) [amd64 arm64 s390x],
+ linux-buildinfo-6.5.0-18-generic (= 6.5.0-18.18~22.04.1) [amd64 arm64 s390x],
+ linux-image-unsigned-6.5.0-18-generic-64k (= 6.5.0-18.18~22.04.1) [arm64],
+ linux-buildinfo-6.5.0-18-generic-64k (= 6.5.0-18.18~22.04.1) [arm64],
  ubuntu-core-initramfs [amd64 arm64],
- linux-modules-extra-6.5.0-17-generic (= 6.5.0-17.17~22.04.1) [amd64 arm64] ,
+ linux-modules-extra-6.5.0-18-generic (= 6.5.0-18.18~22.04.1) [amd64 arm64] ,
  sbsigntool [amd64 arm64],
  openssl,
 Standards-Version: 3.9.4
diff -Nru linux-generate-hwe-6.5-6.5.0/debian/files.json linux-generate-hwe-6.5-6.5.0/debian/files.json
--- linux-generate-hwe-6.5-6.5.0/debian/files.json	2024-01-16 12:33:25.000000000 +0000
+++ linux-generate-hwe-6.5-6.5.0/debian/files.json	2024-02-07 10:01:46.000000000 +0000
@@ -3,37 +3,37 @@
     "files": [
       {
         "arch": "amd64",
-        "file": "/boot/kernel.efi-6.5.0-17-generic",
+        "file": "/boot/kernel.efi-6.5.0-18-generic",
         "sig_type": "efi"
       },
       {
         "arch": "amd64",
-        "file": "/boot/vmlinuz-6.5.0-17-generic",
+        "file": "/boot/vmlinuz-6.5.0-18-generic",
         "sig_type": "efi"
       },
       {
         "arch": "arm64",
-        "file": "/boot/kernel.efi-6.5.0-17-generic",
+        "file": "/boot/kernel.efi-6.5.0-18-generic",
         "sig_type": "efi"
       },
       {
         "arch": "arm64",
-        "file": "/boot/vmlinuz-6.5.0-17-generic",
+        "file": "/boot/vmlinuz-6.5.0-18-generic",
         "sig_type": "efi"
       },
       {
         "arch": "arm64",
-        "file": "/boot/kernel.efi-6.5.0-17-generic-64k",
+        "file": "/boot/kernel.efi-6.5.0-18-generic-64k",
         "sig_type": "efi"
       },
       {
         "arch": "arm64",
-        "file": "/boot/vmlinuz-6.5.0-17-generic-64k",
+        "file": "/boot/vmlinuz-6.5.0-18-generic-64k",
         "sig_type": "efi"
       },
       {
         "arch": "s390x",
-        "file": "/boot/vmlinuz-6.5.0-17-generic",
+        "file": "/boot/vmlinuz-6.5.0-18-generic",
         "sig_type": "sipl"
       }
     ]
diff -Nru linux-generate-hwe-6.5-6.5.0/debian/rules.gen linux-generate-hwe-6.5-6.5.0/debian/rules.gen
--- linux-generate-hwe-6.5-6.5.0/debian/rules.gen	2024-01-16 12:33:25.000000000 +0000
+++ linux-generate-hwe-6.5-6.5.0/debian/rules.gen	2024-02-07 10:01:46.000000000 +0000
@@ -42,54 +42,54 @@
 .PHONY: generate-amd64
 generate-amd64::
 	install -d $(custom_dir)/boot
-	$(call copy_or_download,/boot/kernel.efi-6.5.0-17-generic,$(custom_dir)/boot/kernel.efi-6.5.0-17-generic.efi)
+	$(call copy_or_download,/boot/kernel.efi-6.5.0-18-generic,$(custom_dir)/boot/kernel.efi-6.5.0-18-generic.efi)
 
 .PHONY: generate-amd64
 generate-amd64::
 	install -d $(custom_dir)/boot
-	$(call copy_or_download,/boot/vmlinuz-6.5.0-17-generic,$(custom_dir)/boot/vmlinuz-6.5.0-17-generic.efi)
+	$(call copy_or_download,/boot/vmlinuz-6.5.0-18-generic,$(custom_dir)/boot/vmlinuz-6.5.0-18-generic.efi)
 
 .PHONY: generate-arm64
 generate-arm64::
 	install -d $(custom_dir)/boot
-	$(call copy_or_download,/boot/kernel.efi-6.5.0-17-generic,$(custom_dir)/boot/kernel.efi-6.5.0-17-generic.efi)
-	if [ $$(file --brief --mime-type "$(custom_dir)/boot/kernel.efi-6.5.0-17-generic.efi") = "application/gzip" ]; then \
-	    gunzip -cv <$(custom_dir)/boot/kernel.efi-6.5.0-17-generic.efi >$(custom_dir)/boot/kernel.efi-6.5.0-17-generic.efi.gunzip; \
-	    mv -f $(custom_dir)/boot/kernel.efi-6.5.0-17-generic.efi.gunzip $(custom_dir)/boot/kernel.efi-6.5.0-17-generic.efi; \
-	    echo "GZIP=1" >>$(custom_dir)/boot/kernel.efi-6.5.0-17-generic.efi.vars; \
+	$(call copy_or_download,/boot/kernel.efi-6.5.0-18-generic,$(custom_dir)/boot/kernel.efi-6.5.0-18-generic.efi)
+	if [ $$(file --brief --mime-type "$(custom_dir)/boot/kernel.efi-6.5.0-18-generic.efi") = "application/gzip" ]; then \
+	    gunzip -cv <$(custom_dir)/boot/kernel.efi-6.5.0-18-generic.efi >$(custom_dir)/boot/kernel.efi-6.5.0-18-generic.efi.gunzip; \
+	    mv -f $(custom_dir)/boot/kernel.efi-6.5.0-18-generic.efi.gunzip $(custom_dir)/boot/kernel.efi-6.5.0-18-generic.efi; \
+	    echo "GZIP=1" >>$(custom_dir)/boot/kernel.efi-6.5.0-18-generic.efi.vars; \
 	fi; \
 
 .PHONY: generate-arm64
 generate-arm64::
 	install -d $(custom_dir)/boot
-	$(call copy_or_download,/boot/vmlinuz-6.5.0-17-generic,$(custom_dir)/boot/vmlinuz-6.5.0-17-generic.efi)
-	if [ $$(file --brief --mime-type "$(custom_dir)/boot/vmlinuz-6.5.0-17-generic.efi") = "application/gzip" ]; then \
-	    gunzip -cv <$(custom_dir)/boot/vmlinuz-6.5.0-17-generic.efi >$(custom_dir)/boot/vmlinuz-6.5.0-17-generic.efi.gunzip; \
-	    mv -f $(custom_dir)/boot/vmlinuz-6.5.0-17-generic.efi.gunzip $(custom_dir)/boot/vmlinuz-6.5.0-17-generic.efi; \
-	    echo "GZIP=1" >>$(custom_dir)/boot/vmlinuz-6.5.0-17-generic.efi.vars; \
+	$(call copy_or_download,/boot/vmlinuz-6.5.0-18-generic,$(custom_dir)/boot/vmlinuz-6.5.0-18-generic.efi)
+	if [ $$(file --brief --mime-type "$(custom_dir)/boot/vmlinuz-6.5.0-18-generic.efi") = "application/gzip" ]; then \
+	    gunzip -cv <$(custom_dir)/boot/vmlinuz-6.5.0-18-generic.efi >$(custom_dir)/boot/vmlinuz-6.5.0-18-generic.efi.gunzip; \
+	    mv -f $(custom_dir)/boot/vmlinuz-6.5.0-18-generic.efi.gunzip $(custom_dir)/boot/vmlinuz-6.5.0-18-generic.efi; \
+	    echo "GZIP=1" >>$(custom_dir)/boot/vmlinuz-6.5.0-18-generic.efi.vars; \
 	fi; \
 
 .PHONY: generate-arm64
 generate-arm64::
 	install -d $(custom_dir)/boot
-	$(call copy_or_download,/boot/kernel.efi-6.5.0-17-generic-64k,$(custom_dir)/boot/kernel.efi-6.5.0-17-generic-64k.efi)
-	if [ $$(file --brief --mime-type "$(custom_dir)/boot/kernel.efi-6.5.0-17-generic-64k.efi") = "application/gzip" ]; then \
-	    gunzip -cv <$(custom_dir)/boot/kernel.efi-6.5.0-17-generic-64k.efi >$(custom_dir)/boot/kernel.efi-6.5.0-17-generic-64k.efi.gunzip; \
-	    mv -f $(custom_dir)/boot/kernel.efi-6.5.0-17-generic-64k.efi.gunzip $(custom_dir)/boot/kernel.efi-6.5.0-17-generic-64k.efi; \
-	    echo "GZIP=1" >>$(custom_dir)/boot/kernel.efi-6.5.0-17-generic-64k.efi.vars; \
+	$(call copy_or_download,/boot/kernel.efi-6.5.0-18-generic-64k,$(custom_dir)/boot/kernel.efi-6.5.0-18-generic-64k.efi)
+	if [ $$(file --brief --mime-type "$(custom_dir)/boot/kernel.efi-6.5.0-18-generic-64k.efi") = "application/gzip" ]; then \
+	    gunzip -cv <$(custom_dir)/boot/kernel.efi-6.5.0-18-generic-64k.efi >$(custom_dir)/boot/kernel.efi-6.5.0-18-generic-64k.efi.gunzip; \
+	    mv -f $(custom_dir)/boot/kernel.efi-6.5.0-18-generic-64k.efi.gunzip $(custom_dir)/boot/kernel.efi-6.5.0-18-generic-64k.efi; \
+	    echo "GZIP=1" >>$(custom_dir)/boot/kernel.efi-6.5.0-18-generic-64k.efi.vars; \
 	fi; \
 
 .PHONY: generate-arm64
 generate-arm64::
 	install -d $(custom_dir)/boot
-	$(call copy_or_download,/boot/vmlinuz-6.5.0-17-generic-64k,$(custom_dir)/boot/vmlinuz-6.5.0-17-generic-64k.efi)
-	if [ $$(file --brief --mime-type "$(custom_dir)/boot/vmlinuz-6.5.0-17-generic-64k.efi") = "application/gzip" ]; then \
-	    gunzip -cv <$(custom_dir)/boot/vmlinuz-6.5.0-17-generic-64k.efi >$(custom_dir)/boot/vmlinuz-6.5.0-17-generic-64k.efi.gunzip; \
-	    mv -f $(custom_dir)/boot/vmlinuz-6.5.0-17-generic-64k.efi.gunzip $(custom_dir)/boot/vmlinuz-6.5.0-17-generic-64k.efi; \
-	    echo "GZIP=1" >>$(custom_dir)/boot/vmlinuz-6.5.0-17-generic-64k.efi.vars; \
+	$(call copy_or_download,/boot/vmlinuz-6.5.0-18-generic-64k,$(custom_dir)/boot/vmlinuz-6.5.0-18-generic-64k.efi)
+	if [ $$(file --brief --mime-type "$(custom_dir)/boot/vmlinuz-6.5.0-18-generic-64k.efi") = "application/gzip" ]; then \
+	    gunzip -cv <$(custom_dir)/boot/vmlinuz-6.5.0-18-generic-64k.efi >$(custom_dir)/boot/vmlinuz-6.5.0-18-generic-64k.efi.gunzip; \
+	    mv -f $(custom_dir)/boot/vmlinuz-6.5.0-18-generic-64k.efi.gunzip $(custom_dir)/boot/vmlinuz-6.5.0-18-generic-64k.efi; \
+	    echo "GZIP=1" >>$(custom_dir)/boot/vmlinuz-6.5.0-18-generic-64k.efi.vars; \
 	fi; \
 
 .PHONY: generate-s390x
 generate-s390x::
 	install -d $(custom_dir)/boot
-	$(call copy_or_download,/boot/vmlinuz-6.5.0-17-generic,$(custom_dir)/boot/vmlinuz-6.5.0-17-generic.sipl)
+	$(call copy_or_download,/boot/vmlinuz-6.5.0-18-generic,$(custom_dir)/boot/vmlinuz-6.5.0-18-generic.sipl)