diff --git a/.github/workflows/concrete_compiler_benchmark.yml b/.github/workflows/concrete_compiler_benchmark.yml
index 94db33901..e98f22255 100644
--- a/.github/workflows/concrete_compiler_benchmark.yml
+++ b/.github/workflows/concrete_compiler_benchmark.yml
@@ -14,7 +14,7 @@ on:
       - 'release/*'
 
 env:
-  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete-compiler
+  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete/compiler-ci
   ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
   SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
   SLACK_USERNAME: ${{ secrets.BOT_USERNAME }}
diff --git a/.github/workflows/concrete_compiler_publish_docker_images.yml b/.github/workflows/concrete_compiler_publish_docker_images.yml
index 5b1d3a6d5..4fa71f9e4 100644
--- a/.github/workflows/concrete_compiler_publish_docker_images.yml
+++ b/.github/workflows/concrete_compiler_publish_docker_images.yml
@@ -41,7 +41,7 @@ jobs:
     needs: [setup-instance]
     runs-on: ${{ needs.setup-instance.outputs.runner-name }}
     env:
-      image: ghcr.io/zama-ai/cuda
+      image: ghcr.io/zama-ai/concrete/cuda
     strategy:
       matrix:
         include:
@@ -103,7 +103,7 @@ jobs:
     needs: [setup-instance, cuda-image]
     runs-on: ${{ needs.setup-instance.outputs.runner-name }}
     env:
-      image: ghcr.io/zama-ai/concrete-compiler
+      image: ghcr.io/zama-ai/concrete/compiler-ci
       dockerfile: docker/Dockerfile.concrete-compiler-env
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -169,7 +169,7 @@ jobs:
     needs: [setup-instance, compiler-image]
     runs-on: ${{ needs.setup-instance.outputs.runner-name }}
     env:
-      image: ghcr.io/zama-ai/concrete-compiler-gpu
+      image: ghcr.io/zama-ai/concrete/compiler-ci-gpu
       dockerfile: docker/Dockerfile.concrete-compiler-env-gpu
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/concrete_compiler_test_cpu.yml b/.github/workflows/concrete_compiler_test_cpu.yml
index 66236432f..e7d98cd54 100644
--- a/.github/workflows/concrete_compiler_test_cpu.yml
+++ b/.github/workflows/concrete_compiler_test_cpu.yml
@@ -14,7 +14,7 @@ on:
       - 'release/*'
 
 env:
-  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete-compiler
+  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete/compiler-ci
   ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
   SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
   SLACK_USERNAME: ${{ secrets.BOT_USERNAME }}
diff --git a/.github/workflows/concrete_compiler_test_gpu.yml b/.github/workflows/concrete_compiler_test_gpu.yml
index 83b994fc6..30b90d032 100644
--- a/.github/workflows/concrete_compiler_test_gpu.yml
+++ b/.github/workflows/concrete_compiler_test_gpu.yml
@@ -14,7 +14,7 @@ on:
       - 'release/*'
 
 env:
-  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete-compiler-gpu
+  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete/compiler-ci-gpu
   ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
   SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
   SLACK_USERNAME: ${{ secrets.BOT_USERNAME }}
diff --git a/.github/workflows/concrete_ml_test.yml b/.github/workflows/concrete_ml_test.yml
index ac9db35f6..10f3b4e02 100644
--- a/.github/workflows/concrete_ml_test.yml
+++ b/.github/workflows/concrete_ml_test.yml
@@ -12,7 +12,7 @@ on:
       - 'release/*'
 
 env:
-  DOCKER_IMAGE: ghcr.io/zama-ai/concrete-compiler
+  DOCKER_IMAGE: ghcr.io/zama-ai/concrete/compiler-ci
   ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
   SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
   SLACK_USERNAME: ${{ secrets.BOT_USERNAME }}
diff --git a/.github/workflows/concrete_python_benchmark.yml b/.github/workflows/concrete_python_benchmark.yml
index 0ecee7af3..657cd6c80 100644
--- a/.github/workflows/concrete_python_benchmark.yml
+++ b/.github/workflows/concrete_python_benchmark.yml
@@ -12,7 +12,7 @@ on:
       - 'main'
       - 'release/*'
 env:
-  DOCKER_IMAGE: ghcr.io/zama-ai/concrete-compiler
+  DOCKER_IMAGE: ghcr.io/zama-ai/concrete/compiler-ci
 
 concurrency:
   group: concrete_python_benchmark_${{ github.ref }}
diff --git a/.github/workflows/concrete_python_release.yml b/.github/workflows/concrete_python_release.yml
index 600b9af06..94f8e6372 100644
--- a/.github/workflows/concrete_python_release.yml
+++ b/.github/workflows/concrete_python_release.yml
@@ -10,8 +10,8 @@ on:
     - cron: "0 3 * * 2-6"
 
 env:
-  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete-compiler
-  DOCKER_IMAGE_TEST_GPU: ghcr.io/zama-ai/concrete-compiler-gpu
+  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete/compiler-ci
+  DOCKER_IMAGE_TEST_GPU: ghcr.io/zama-ai/concrete/compiler-ci-gpu
   CUDA_PATH: /usr/local/cuda-11.8
   ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
   SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
diff --git a/.github/workflows/concrete_python_tests_linux.yml b/.github/workflows/concrete_python_tests_linux.yml
index 0d0ba474c..21ea07703 100644
--- a/.github/workflows/concrete_python_tests_linux.yml
+++ b/.github/workflows/concrete_python_tests_linux.yml
@@ -12,7 +12,7 @@ on:
       - 'release/*'
 
 env:
-  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete-compiler
+  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete/compiler-ci
   ACTION_RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
   SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
   SLACK_USERNAME: ${{ secrets.BOT_USERNAME }}
diff --git a/docker/Dockerfile.concrete-compiler-env-gpu b/docker/Dockerfile.concrete-compiler-env-gpu
index f211307b4..67985588e 100644
--- a/docker/Dockerfile.concrete-compiler-env-gpu
+++ b/docker/Dockerfile.concrete-compiler-env-gpu
@@ -1,7 +1,7 @@
-ARG BASEIMAGE=ghcr.io/zama-ai/concrete-compiler:latest
+ARG BASEIMAGE=ghcr.io/zama-ai/concrete/compiler-ci:latest
 # hadolint ignore=DL3006
 FROM $BASEIMAGE
 
 # Setup CUDA
-COPY --from=ghcr.io/zama-ai/cuda:11-8 /usr/local/cuda-11.8/ /usr/local/cuda-11.8/
+COPY --from=ghcr.io/zama-ai/concrete/cuda:11-8 /usr/local/cuda-11.8/ /usr/local/cuda-11.8/
 ENV PATH="$PATH:/usr/local/cuda-11.8/bin"