diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 494bad08..ee41caa8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,10 +19,10 @@ jobs:
             c_compiler: [gcc, clang]
             include:
                - c_library: glibc
-                 void_image: ghcr.io/void-linux/void-linux:20220530rc01-full-x86_64
+                 void_image: ghcr.io/void-linux/void-glibc-full:20230830r1
 
                - c_library: musl
-                 void_image: ghcr.io/void-linux/void-linux:20220530rc01-full-x86_64-musl
+                 void_image: ghcr.io/void-linux/void-musl-full:20230830r1
 
       runs-on: ubuntu-latest
       container: ${{ matrix.void_image }}
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
index 18b5dcdc..8f43a358 100644
--- a/.github/workflows/codeql.yaml
+++ b/.github/workflows/codeql.yaml
@@ -21,7 +21,7 @@ jobs:
       contents: read
       security-events: write
     container:
-      image: ghcr.io/void-linux/void-linux:20220530rc01-full-x86_64
+      image: ghcr.io/void-linux/void-glibc-full:20230830r1
     steps:
     - name: Prepare container
       run: |
diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml
index 6a571c9c..320a0936 100644
--- a/.github/workflows/coverity-scan.yml
+++ b/.github/workflows/coverity-scan.yml
@@ -9,7 +9,7 @@ jobs:
   latest:
     if: github.repository == 'void-linux/xbps'
     runs-on: ubuntu-latest
-    container: ghcr.io/void-linux/void-linux:20220530rc01-full-x86_64
+    container: ghcr.io/void-linux/void-glibc-full:20230830r1
     env:
       TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
     steps:
diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
index 13f2e238..b6d1ad32 100644
--- a/.github/workflows/doxygen.yaml
+++ b/.github/workflows/doxygen.yaml
@@ -17,7 +17,7 @@ concurrency:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/void-linux/void-linux:20220530rc01-full-x86_64
+    container: ghcr.io/void-linux/void-glibc-full:20230830r1
     steps:
       - name: Prepare container
         run: |
diff --git a/TODO b/TODO
index d5908a12..eb95ee6e 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,10 @@
 libxbps:
  - transaction: avoid fetching the whole pkg when updating and only fetch
    modified files from target pkg.
- - transaction: split fetch part to xbps_transaction_fetch().
- - transaction: check for obsoletes exactly once, via xbps_transaction_prepare().
  - transaction: check for free space in all affected top-level dirs.
  - transaction: check all pkg top-level dirs to see if they are writable.
+ - cache: download cached packages and signatures into a per repository
+   directory like repodata files in /var/db/xbps
 
 xbps-*:
  - Document exit codes.