diff --git a/.gitignore b/.gitignore
index 4678ac9..ad07063 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,5 +73,3 @@
 /kata-containers-3.21.0-vendor.tar.gz
 /kata-containers-3.22.0.tar.gz
 /kata-containers-3.22.0-vendor.tar.gz
-/kata-containers-3.23.0.tar.gz
-/kata-containers-3.23.0-vendor.tar.gz
diff --git a/1001-Remove-warnings-as-compilation-errors.patch b/1001-Remove-warnings-as-compilation-errors.patch
index 19fffda..140375f 100644
--- a/1001-Remove-warnings-as-compilation-errors.patch
+++ b/1001-Remove-warnings-as-compilation-errors.patch
@@ -18,18 +18,18 @@ Signed-off-by: Emanuel Lima <emlima@redhat.com>
  10 files changed, 18 insertions(+), 18 deletions(-)
 
 diff --git a/src/agent/Makefile b/src/agent/Makefile
+index e62a894aa..39d351213 100644
 --- a/src/agent/Makefile
 +++ b/src/agent/Makefile
-@@ -120,7 +120,7 @@ static-checks-build: $(GENERATED_CODE)
+@@ -130,14 +130,14 @@ static-checks-build: $(GENERATED_CODE)
  $(TARGET): $(GENERATED_CODE) $(TARGET_PATH)
 
  $(TARGET_PATH): show-summary
 -	@RUSTFLAGS="$(EXTRA_RUSTFLAGS) --deny warnings" cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES)
 +	@RUSTFLAGS="$(EXTRA_RUSTFLAGS) " cargo build --target $(TRIPLE) $(if $(findstring release,$(BUILD_TYPE)),--release) $(EXTRA_RUSTFEATURES)
 
- $(GENERATED_FILES): %: %.in $(VERSION_FILE)
+ $(GENERATED_FILES): %: %.in
  	@sed $(foreach r,$(GENERATED_REPLACEMENTS),-e 's|@$r@|$($r)|g') "$<" > "$@"
-@@ -127,7 +127,7 @@ $(GENERATED_FILES): %: %.in $(VERSION_FILE)
 
  ##TARGET optimize: optimized  build
  optimize: show-summary show-header
@@ -38,7 +38,6 @@ diff --git a/src/agent/Makefile b/src/agent/Makefile
 
  ##TARGET install: install agent
  install: install-services
-
 diff --git a/src/dragonball/Makefile b/src/dragonball/Makefile
 index 40bb7f915..5eb2c1016 100644
 --- a/src/dragonball/Makefile
@@ -67,9 +66,10 @@ index aabaa3391..1fb6b20c3 100644
  format:
  	@echo "INFO: cargo fmt..."
 diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile
+index 0bb0617ff..188040864 100644
 --- a/src/runtime-rs/Makefile
 +++ b/src/runtime-rs/Makefile
-@@ -658,7 +658,7 @@ static-checks-build: $(GENERATED_FILES)
+@@ -600,7 +600,7 @@ static-checks-build: $(GENERATED_FILES)
  $(TARGET): $(GENERATED_FILES) $(TARGET_PATH)
 
  $(TARGET_PATH): $(SOURCES) | show-summary
@@ -78,7 +78,7 @@ diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile
 
  $(GENERATED_FILES): %: %.in
  	@sed \
-@@ -668,7 +668,7 @@ $(GENERATED_FILES): %: %.in
+@@ -610,7 +610,7 @@ $(GENERATED_FILES): %: %.in
 
  ##TARGET optimize: optimized  build
  optimize: $(SOURCES) | show-summary show-header
diff --git a/kata-containers.spec b/kata-containers.spec
index 2ed9f3c..641d018 100644
--- a/kata-containers.spec
+++ b/kata-containers.spec
@@ -28,7 +28,7 @@
 %endif
 
 # https://github.com/kata-containers/kata-containers
-Version: 3.23.0
+Version: 3.22.0
 %global tag         %{version}%{?rcstr}
 
 %global domain      github.com
@@ -390,15 +390,9 @@ fi
 
 
 %changelog
-* Mon Nov 03 2025 Christophe de Dinechin <dinechin@redhat.com> - 3.22.0-1
+* Tue Nov 04 2025 Christophe de Dinechin <dinechin@redhat.com> - 3.22.0-1
 - kata-containers 3.22.0
 
-* Sun Oct 12 2025 Maxwell G <maxwell@gtmx.me> - 3.21.0-1.2
-- Rebuild for golang 1.25.2
-
-* Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 3.21.0-1.1
-- rebuild
-
 * Thu Sep 25 2025 Christophe de Dinechin <dinechin@redhat.com> - 3.21.0-1
 - kata-containers 3.21.0
 
diff --git a/sources b/sources
index 0c1fe9f..c82bc85 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (kata-containers-3.23.0.tar.gz) = d921dace40545fab47647c68357d88bf2807b74d5b3546ed0d91416b98fbad4ecaabf449abcc20e34cee8fbcacffe4a66a6012b63815e6b2c60c0319f982cc6e
-SHA512 (kata-containers-3.23.0-vendor.tar.gz) = 484c2dececc31a4fa9d4662f0a0051d52a916728e673396fbb70ab8ef02eb3ac225b815a03e2799aa7bcfe6478dd3ad785c628879914b0b113123f3952795c7b
+SHA512 (kata-containers-3.22.0.tar.gz) = 142bc70b6455f545d534371a845980ed00985d7225b5f672f3fef046a6f0a31871bd69ee2c931ab94c10089086123fe5987ec6615d7a7308027531269c4dae48
+SHA512 (kata-containers-3.22.0-vendor.tar.gz) = 10b28d746d5176acce4abcb902213edcfb43b0b390a5d20f114b7dc4e11bc8de26098f180bdf75bcff3e6d03f2b3a31908f4386d7ca24119f9e001cd99c52060