diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index 98a484c8..ac7f60dc 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -20,7 +20,7 @@ jobs:
     name: Validate library
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
+      image: ghcr.io/rest-for-physics/root:latest
     steps:
       - uses: rest-for-physics/framework/.github/actions/checkout@master
         with:
@@ -33,7 +33,7 @@ jobs:
     name: Validate pre-commit config
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
+      image: ghcr.io/rest-for-physics/root:latest
     steps:
       - name: Checkout rawlib
         uses: rest-for-physics/framework/.github/actions/checkout@master
@@ -50,7 +50,7 @@ jobs:
     name: Build only rawlib
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
+      image: ghcr.io/rest-for-physics/root:latest
     steps:
       - name: Build and install
         uses: rest-for-physics/framework/.github/actions/build@master
@@ -61,14 +61,14 @@ jobs:
         id: rawlib-install-cache
         uses: actions/cache@v3
         with:
-          key: ${{ env.BRANCH_NAME }}-${{ github.sha }}
+          key: ${{ env.BRANCH_NAME }}-raw-${{ github.sha }}
           path: ${{ env.REST_PATH }}
 
   Process:
     name: Check processes
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
+      image: ghcr.io/rest-for-physics/root:latest
     needs: [ build-rawlib ]
     steps:
       - uses: rest-for-physics/framework/.github/actions/checkout@master
@@ -80,7 +80,7 @@ jobs:
         uses: actions/cache@v3
         id: rawlib-install-cache
         with:
-          key: ${{ env.BRANCH_NAME }}-${{ github.sha }}
+          key: ${{ env.BRANCH_NAME }}-raw-${{ github.sha }}
           path: ${{ env.REST_PATH }}
       - name: Add signal noise
         run: |
@@ -124,7 +124,7 @@ jobs:
     name: Process Dream data
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
+      image: ghcr.io/rest-for-physics/root:latest
     needs: [ build-rawlib ]
     steps:
       - uses: rest-for-physics/framework/.github/actions/checkout@master
@@ -136,7 +136,7 @@ jobs:
         uses: actions/cache@v3
         id: rawlib-install-cache
         with:
-          key: ${{ env.BRANCH_NAME }}-${{ github.sha }}
+          key: ${{ env.BRANCH_NAME }}-raw-${{ github.sha }}
           path: ${{ env.REST_PATH }}
       - name: Dream data
         run: |