diff --git a/.github/platforms.json b/.github/platforms.json
index 9ac6597..de87059 100644
--- a/.github/platforms.json
+++ b/.github/platforms.json
@@ -56,7 +56,7 @@
     "linux_x86_64": [
       {
         "platform": "x86_64-linux",
-        "os": "ubuntu-latest",
+        "os": "ubuntu-22.04",
         "ruby": "3.4",
         "description": "Linux x86_64 (generic)",
         "build": true,
@@ -65,7 +65,7 @@
       },
       {
         "platform": "x86_64-linux-gnu",
-        "os": "ubuntu-latest",
+        "os": "ubuntu-22.04",
         "ruby": "3.4",
         "description": "Linux x86_64 GNU libc",
         "build": true,
@@ -83,7 +83,7 @@
     "linux_aarch64": [
       {
         "platform": "aarch64-linux",
-        "os": "ubuntu-latest",
+        "os": "ubuntu-22.04",
         "ruby": "3.4",
         "description": "Linux ARM64 (generic)",
         "build": true,
@@ -93,7 +93,7 @@
       },
       {
         "platform": "aarch64-linux-gnu",
-        "os": "ubuntu-latest",
+        "os": "ubuntu-22.04",
         "ruby": "3.4",
         "description": "Linux ARM64 GNU libc",
         "build": true,
diff --git a/.github/workflows/gem-build.yml b/.github/workflows/gem-build.yml
index e44eac9..3e86cae 100644
--- a/.github/workflows/gem-build.yml
+++ b/.github/workflows/gem-build.yml
@@ -62,8 +62,6 @@ jobs:
             tmp
             lib/ffi-libarchive-binary/libarchive.*
           key: deps-${{ matrix.platform }}-${{ hashFiles('ext/configuration.yml', 'lib/ffi-libarchive-binary/*_recipe.rb', 'lib/ffi-libarchive-binary/base_recipe.rb') }}
-          restore-keys: |
-            deps-${{ matrix.platform }}-
 
       - uses: ruby/setup-ruby@v1
         with:
diff --git a/lib/ffi-libarchive-binary/libarchive_recipe.rb b/lib/ffi-libarchive-binary/libarchive_recipe.rb
index 747d2c8..57daa6f 100644
--- a/lib/ffi-libarchive-binary/libarchive_recipe.rb
+++ b/lib/ffi-libarchive-binary/libarchive_recipe.rb
@@ -45,9 +45,10 @@ def default_flags
         "-DENABLE_OPENSSL:BOOL=ON",   "-DENABLE_LIBB2:BOOL=OFF",      "-DENABLE_LZ4:BOOL=OFF",
         "-DENABLE_LZO::BOOL=OFF",     "-DENABLE_LZMA:BOOL=ON",        "-DENABLE_ZSTD:BOOL=OFF",
         "-DENABLE_ZLIB::BOOL=ON",     "-DENABLE_BZip2:BOOL=OFF",      "-DENABLE_LIBXML2:BOOL=OFF",
-        "-DENABLE_EXPAT::BOOL=ON",    "-DENABLE_TAR:BOOL=OFF",        "-DENABLE_CPIO::BOOL=OFF",
-        "-DENABLE_CAT:BOOL=OFF",      "-DENABLE_ACL:BOOL=OFF",        "-DENABLE_TEST:BOOL=OFF",
-        "-DENABLE_UNZIP:BOOL=OFF",    "-DOPENSSL_USE_STATIC_LIBS=ON", "-DENABLE_XAR:BOOL=ON",
+        "-DENABLE_EXPAT::BOOL=ON",    "-DENABLE_TAR:BOOL=OFF",        "-DENABLE_ICONV:BOOL=OFF",
+        "-DENABLE_CPIO::BOOL=OFF",    "-DENABLE_CAT:BOOL=OFF",        "-DENABLE_ACL:BOOL=OFF",
+        "-DENABLE_TEST:BOOL=OFF",     "-DENABLE_UNZIP:BOOL=OFF",      "-DOPENSSL_USE_STATIC_LIBS=ON",
+        "-DENABLE_XAR:BOOL=ON",
 
         # Provide root directories - let CMake find libraries in lib or lib64
         "-DOPENSSL_ROOT_DIR:PATH=#{@openssl_recipe.path}",