diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index bed69d996..0564b54d1 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -10,9 +10,9 @@ on:
 
 # DOCKER_IMAGE variables aren't used in BuildAndPushDockerImages because of https://github.com/actions/runner/issues/480
 env:
-  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concretefhe-compiler
-  DOCKER_IMAGE_TEST_GCC6: ghcr.io/zama-ai/concretefhe-compiler-gcc6
-  DOCKER_IMAGE_TEST_DF: ghcr.io/zama-ai/concretefhe-compiler-df
+  DOCKER_IMAGE_TEST: ghcr.io/zama-ai/concrete-compiler
+  DOCKER_IMAGE_TEST_GCC6: ghcr.io/zama-ai/concrete-compiler-gcc6
+  DOCKER_IMAGE_TEST_DF: ghcr.io/zama-ai/concrete-compiler-df
 
 jobs:
   ########################
@@ -447,14 +447,14 @@ jobs:
       matrix:
         include:
           - name: test-env
-            image: ghcr.io/zama-ai/concretefhe-compiler
-            dockerfile: builders/Dockerfile.concretefhe-compiler-env
+            image: ghcr.io/zama-ai/concrete-compiler
+            dockerfile: builders/Dockerfile.concrete-compiler-env
           - name: test-env-gcc6
-            image: ghcr.io/zama-ai/concretefhe-compiler-gcc6
-            dockerfile: builders/Dockerfile.concretefhe-compiler-gcc6-env
+            image: ghcr.io/zama-ai/concrete-compiler-gcc6
+            dockerfile: builders/Dockerfile.concrete-compiler-gcc6-env
           - name: test-df
-            image: ghcr.io/zama-ai/concretefhe-compiler-df
-            dockerfile: builders/Dockerfile.concretefhe-compiler-df-env
+            image: ghcr.io/zama-ai/concrete-compiler-df
+            dockerfile: builders/Dockerfile.concrete-compiler-df-env
 
     steps:
       - uses: actions/checkout@v2
diff --git a/builders/Dockerfile.concretefhe-compiler-df-env b/builders/Dockerfile.concrete-compiler-df-env
similarity index 100%
rename from builders/Dockerfile.concretefhe-compiler-df-env
rename to builders/Dockerfile.concrete-compiler-df-env
diff --git a/builders/Dockerfile.concretefhe-compiler-env b/builders/Dockerfile.concrete-compiler-env
similarity index 100%
rename from builders/Dockerfile.concretefhe-compiler-env
rename to builders/Dockerfile.concrete-compiler-env
diff --git a/builders/Dockerfile.concretefhe-compiler-gcc6-env b/builders/Dockerfile.concrete-compiler-gcc6-env
similarity index 100%
rename from builders/Dockerfile.concretefhe-compiler-gcc6-env
rename to builders/Dockerfile.concrete-compiler-gcc6-env
diff --git a/compiler/Makefile b/compiler/Makefile
index 19fb7fd26..338bb00c3 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -165,8 +165,8 @@ not:
 # Python packages
 
 define build_image_and_copy_wheels
-	docker image build -t concretefhe-compiler-manylinux:$(1) --build-arg python_tag=$(1) -f ../builders/Dockerfile.release_manylinux_2_24_x86_64 ..
-	docker container run --rm -v ${PWD}/../wheels:/wheels_volume concretefhe-compiler-manylinux:$(1) cp -r /wheels/. /wheels_volume/.
+	docker image build -t concrete-compiler-manylinux:$(1) --build-arg python_tag=$(1) -f ../builders/Dockerfile.release_manylinux_2_24_x86_64 ..
+	docker container run --rm -v ${PWD}/../wheels:/wheels_volume concrete-compiler-manylinux:$(1) cp -r /wheels/. /wheels_volume/.
 endef
 
 package_py38: update_python_version
@@ -179,8 +179,8 @@ package_py310: update_python_version
 	$(call build_image_and_copy_wheels,cp310-cp310)
 
 release_tarballs:
-	docker image build -t concretefhe-compiler-manylinux:linux_x86_64_tarball -f ../builders/Dockerfile.release_tarball_linux_x86_64 ..
-	docker container run --rm -v ${PWD}/../tarballs:/tarballs_volume concretefhe-compiler-manylinux:linux_x86_64_tarball cp -r /tarballs/. /tarballs_volume/.
+	docker image build -t concrete-compiler-manylinux:linux_x86_64_tarball -f ../builders/Dockerfile.release_tarball_linux_x86_64 ..
+	docker container run --rm -v ${PWD}/../tarballs:/tarballs_volume concrete-compiler-manylinux:linux_x86_64_tarball cp -r /tarballs/. /tarballs_volume/.
 
 update_python_version:
 	echo "__version__ = \"`git describe --tags --abbrev=0 | grep -e '[0-9].*' -o`\"" > lib/Bindings/Python/version.txt