diff --git a/CHANGELOG.md b/CHANGELOG.md
index a783c3d..734ce7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ Record of the modification in project development.
 ### Deprecated
 ### Removed
 ### Fixed
+- [Issue 32 : Ubuntu 22.04 fails to deactivate the swap](https://github.com/suikan4github/kaiten-yaki/issues/32)
+
 ### Known Issue
 
 ## [1.2.0] - 2021-10-16
diff --git a/script/ubuntu-kaiten-yaki.sh b/script/ubuntu-kaiten-yaki.sh
index adfbbdd..7b932e3 100644
--- a/script/ubuntu-kaiten-yaki.sh
+++ b/script/ubuntu-kaiten-yaki.sh
@@ -66,6 +66,9 @@ function main() {
 	# The script is parameterized by env-variable to fit to the distribution 
 	post_install
 
+	# Free LUKS volume as swap volume.
+	swapoff -a
+
 	# Normal end
 	return 0
 
diff --git a/script/void-kaiten-yaki.sh b/script/void-kaiten-yaki.sh
index c63f906..d31adcc 100644
--- a/script/void-kaiten-yaki.sh
+++ b/script/void-kaiten-yaki.sh
@@ -81,6 +81,9 @@ function main() {
 	# The script is parameterized by env-variable to fit to the distribution 
 	post_install
 
+	# Free LUKS volume as swap volume.
+	swapoff -a
+
 	# Normal end
 	return 0