diff --git a/.gitignore b/.gitignore
index db7af65d..bc3900f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-docker-compose.override.yml
+compose.override.yaml
 /.env
 .ssh/
-.idea/
\ No newline at end of file
+.idea/
diff --git a/Makefile b/Makefile
index 9c9d2be5..b83079ad 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ flogs: sync-env ## Display logs of front
 ## We add `; \` to ignore error. `cp -n .env.dist .env;` could not work if .env exist already, it wont be replaced
 init-dev: sync-env ## Init dev env
 	cp -n .env.dist .env; \
-	cp -n docker-compose.override.yml.template docker-compose.override.yml; \
+	cp -n compose.override.yaml.template compose.override.yaml; \
 	if uname | grep -iq "linux\|darwin"; then \
 		echo "Add $(BASE_DOMAIN) and $(API_DOMAIN)  mail.${BASE_DOMAIN} and samltest.$(BASE_DOMAIN) to your /etc/hosts"; \
 		if  grep -q $(BASE_DOMAIN) /etc/hosts ; then echo "not adding to /etc/hosts" ; else printf "\n127.0.0.1 $(BASE_DOMAIN) $(API_DOMAIN) samltest.$(BASE_DOMAIN) mail.${BASE_DOMAIN}\n" | sudo tee -a /etc/hosts ; fi \
diff --git a/README.md b/README.md
index 6fed7e77..ce791fab 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ When cloning your project, you need to
 
 - Copy a .env.dist as a .env
 - Create expected values into your "/etc/hosts"
-- Copy docker-compose.override.yml.template into docker-compose.override.yml
+- Copy compose.override.yaml.template into compose.override.yaml
 
 A specific makefile task has been created:
 
diff --git a/docker-compose.override.yml.template b/compose.override.yaml.template
similarity index 96%
rename from docker-compose.override.yml.template
rename to compose.override.yaml.template
index 8fae87ad..2dcad054 100644
--- a/docker-compose.override.yml.template
+++ b/compose.override.yaml.template
@@ -29,7 +29,7 @@ services:
   initback:
     extends:
       service: back
-      file: docker-compose.yml
+      file: compose.yaml
     restart: "no"
     volumes:
       - ./apps/back:/var/www/html/:delegated
@@ -60,7 +60,7 @@ services:
   mysql_tests:
     extends:
       service: mysql
-      file: docker-compose.yml
+      file: compose.yaml
     tmpfs:
       - /var/lib/mysql
 
@@ -92,4 +92,4 @@ networks:
   tcm_network:
     name: tcm_network
   default:
-    name: tcm_network
\ No newline at end of file
+    name: tcm_network
diff --git a/docker-compose.yml b/compose.yaml
similarity index 100%
rename from docker-compose.yml
rename to compose.yaml
diff --git a/docs/01_getting_started.md b/docs/01_getting_started.md
index 14a3ddb8..883c4799 100644
--- a/docs/01_getting_started.md
+++ b/docs/01_getting_started.md
@@ -1,6 +1,6 @@
 // prepare dev env
 ```
-cp docker-compose.override.yml.template docker-compose.override.yml
+cp compose.override.yaml.template compose.override.yaml
 cp .env.dist .env
 ```
 
diff --git a/docs/CICD.md b/docs/CICD.md
index 358f48fb..3d1a0e32 100644
--- a/docs/CICD.md
+++ b/docs/CICD.md
@@ -45,7 +45,7 @@ sudo docker run hello-world
 sudo apt  install docker-compose
 sudo apt install make
 cp .env.dist .env
-cp docker-compose.override.yml.template  docker-compose.override.yml
+cp compose.override.yaml.template  compose.override.yaml
 
 sudo groupadd docker 
 sudo usermod -aG docker $USER
@@ -55,4 +55,4 @@ To finish, Create a deploy token (NOT a key) named gitlab-deploy-token
 
 After that, add the server IP into the gitlab-ci.yml
 
-Then, on GIT tag, it should deploy
\ No newline at end of file
+Then, on GIT tag, it should deploy