diff --git a/.cirrus.yml b/.cirrus.yml
index a0147d39..58d6afa6 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -86,7 +86,6 @@ task:
       - echo $CACHE_VER
 
   tebako_setup_script: |
-    gem install bundler -v $BUNDLER_VER
     sudo gem install tebako
 
   package_metanorma_script: |
diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
index dbab03cf..fc201844 100644
--- a/.github/workflows/alpine.yml
+++ b/.github/workflows/alpine.yml
@@ -59,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: prepare
     container:
-      image: ghcr.io/tamatebako/amd64-tebako-alpine-3.17:latest
+      image: ghcr.io/tamatebako/tebako-alpine-3.17:latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index cd823f6a..2e7aca80 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -57,7 +57,7 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/tamatebako/amd64-tebako-ubuntu-20.04:latest
+    container: ghcr.io/tamatebako/tebako-ubuntu-20.04:latest
     needs: prepare
     if: "(github.event_name == 'push' && needs.prepare.outputs.head_tag == '') || github.event_name == 'pull_request' || github.event_name == 'schedule'"
     steps:
diff --git a/common.env b/common.env
index 646300e2..a1b56a22 100644
--- a/common.env
+++ b/common.env
@@ -1,6 +1,5 @@
-RUBY_VER=3.1.6
+RUBY_VER=3.2.5
 TEBAKO_PREFIX=.archive/.tebako
 DEPS=deps
-BUNDLER_VER=2.3.22
 BUILD_TYPE=Release
-CACHE_VER=07
+CACHE_VER=08