diff --git a/.github/workflows/build-and-run.yml b/.github/workflows/build-and-run.yml
index 591d8cbf..c712534c 100644
--- a/.github/workflows/build-and-run.yml
+++ b/.github/workflows/build-and-run.yml
@@ -251,15 +251,21 @@ jobs:
 
   Build-in-Container-Gentoo:
     runs-on: ubuntu-24.04
-    container:
-      image: gentoo/stage3
     steps:
-      - name: Prepare gentoo
-        run: getuto && emerge --sync
+      - name: Prepare Gentoo Docker image
+        run: |
+          docker create -v /var/db/repos/gentoo --name portagesnapshot gentoo/portage:latest /bin/true
+          docker run -di --name gentoo --volumes-from portagesnapshot gentoo/stage3:latest /bin/bash
+          docker exec gentoo getuto
       - name: Install build tools
         run: |
-          emerge -g --autounmask-write sys-kernel/gentoo-kernel-bin || (etc-update --verbose --automode -5 && emerge -g sys-kernel/gentoo-kernel-bin)
-          emerge -g dev-vcs/git dev-libs/libpcre dev-build/cmake dev-lang/lua:5.1
+          docker exec gentoo emerge -g dev-vcs/git 
+          docker exec gentoo emerge -g dev-libs/libpcre
+          docker exec gentoo emerge -g dev-build/cmake
+          docker exec gentoo emerge -g dev-lang/lua:5.1
+          docker exec gentoo sh -c 'emerge -g --autounmask-write sys-kernel/gentoo-kernel-bin || (etc-update --verbose --automode -5 && emerge -g sys-kernel/gentoo-kernel-bin)'
+      - name: stop
+        run: echo 1
       - name: Check out repository code
         uses: actions/checkout@v4
         with: