diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md
index 9e74987c1a..db72c170bd 100644
--- a/.github/ISSUE_TEMPLATE/Bug_report.md
+++ b/.github/ISSUE_TEMPLATE/Bug_report.md
@@ -21,7 +21,7 @@ A clear and concise description of what the bug is.
 Paste here
 ```
 
-**Contents of your `docker-compose.yml`**
+**Contents of your `compose.yml`**
 ```
 Paste here
 REMOVE COMMENTED LINES
@@ -33,7 +33,7 @@ Paste here
 REMOVE COMMENTED LINES
 ```
 
-**Logs output `docker-compose logs`**
+**Logs output `docker compose logs`**
 ```
 Paste here
 ```
diff --git a/.github/ISSUE_TEMPLATE/Custom.md b/.github/ISSUE_TEMPLATE/Custom.md
index a52bbe24f5..5b5cf5b007 100644
--- a/.github/ISSUE_TEMPLATE/Custom.md
+++ b/.github/ISSUE_TEMPLATE/Custom.md
@@ -15,7 +15,7 @@ A clear and concise description of your issue.
 Paste here
 ```
 
-**Contents of your `docker-compose.yml`**
+**Contents of your `compose.yml`**
 ```
 Paste here
 ```
@@ -25,7 +25,7 @@ Paste here
 Paste here
 ```
 
-**Logs output `docker-compose logs`**
+**Logs output `docker compose logs`**
 ```
 Paste here
 ```
diff --git a/.github/issue_template.md b/.github/issue_template.md
index e79f7cfb13..374ec121b0 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -12,7 +12,7 @@ e.g. macOS Sierra
 ### Docker compose file
 Make sure you remove all commented services.
 ```yml
-# Content of your docker-compose.yml file. Make sure you remove all sensible information you might have there.
+# Content of your compose.yml file. Make sure you remove all sensible information you might have there.
 ```
 
 ### .env file
@@ -22,5 +22,5 @@ Make sure you remove all commented services.
 
 ### Logs output
 ```
-# Run "docker-compose logs [service]". Let's say you get 500 error for some reason then it'll be helpful to provide logs for php and http server (nginx/apache) services.
+# Run "docker compose logs [service]". Let's say you get 500 error for some reason then it'll be helpful to provide logs for php and http server (nginx/apache) services.
 ```
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 7fcd3a41d8..d49e1e29d8 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -34,7 +34,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: prepare artifact
-      run: cp docker.mk Makefile && tar -czf docker4drupal.tar.gz docker-compose.yml docker-compose.override.yml Makefile .env traefik.yml
+      run: cp docker.mk Makefile && tar -czf docker4drupal.tar.gz compose.yml compose.override.yml Makefile .env traefik.yml
     - name: get tag name
       id: vars
       run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
@@ -47,4 +47,4 @@ jobs:
         overwrite: true
         tags: true
         draft: false
-        tag_name: ${{ steps.vars.outputs.tag }}
\ No newline at end of file
+        tag_name: ${{ steps.vars.outputs.tag }}
diff --git a/README.md b/README.md
index bb489957a6..c5cce443ef 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 ## Introduction
 
-Docker4Drupal is a set of docker images optimized for Drupal. Use `docker-compose.yml` file from the [latest stable release](https://github.com/wodby/docker4drupal/releases) to spin up local environment on Linux, Mac OS X and Windows. 
+Docker4Drupal is a set of docker images optimized for Drupal. Use `compose.yml` file from the [latest stable release](https://github.com/wodby/docker4drupal/releases) to spin up local environment on Linux, Mac OS X and Windows. 
 
 * Read the docs on [**how to use**](https://wodby.com/docs/stacks/drupal/local#usage)
 * Ask questions on [Discord](http://discord.wodby.com/)
@@ -66,7 +66,7 @@ We regularly update images used in this stack and release them together, see [re
 
 ## Beyond local environment
 
-Docker4Drupal is a project designed to help you spin up local environment with docker-compose. If you want to deploy a consistent stack with orchestrations to your own server, check out [Drupal stack](https://wodby.com/stacks/drupal) on Wodby ![](https://www.google.com/s2/favicons?domain=wodby.com).
+Docker4Drupal is a project designed to help you spin up local environment with Docker Compose. If you want to deploy a consistent stack with orchestrations to your own server, check out [Drupal stack](https://wodby.com/stacks/drupal) on Wodby ![](https://www.google.com/s2/favicons?domain=wodby.com).
 
 ## Other Docker4x projects
 
diff --git a/docker-compose.override.yml b/compose.override.yml
similarity index 100%
rename from docker-compose.override.yml
rename to compose.override.yml
diff --git a/docker-compose.yml b/compose.yml
similarity index 100%
rename from docker-compose.yml
rename to compose.yml
diff --git a/docker.mk b/docker.mk
index 21c1f955f1..788454f006 100644
--- a/docker.mk
+++ b/docker.mk
@@ -19,8 +19,8 @@ endif
 .PHONY: up
 up:
 	@echo "Starting up containers for $(PROJECT_NAME)..."
-	docker-compose pull
-	docker-compose up -d --remove-orphans
+	docker compose pull
+	docker compose up -d --remove-orphans
 
 .PHONY: mutagen
 mutagen:
@@ -34,13 +34,13 @@ down: stop
 .PHONY: start
 start:
 	@echo "Starting containers for $(PROJECT_NAME) from where you left off..."
-	@docker-compose start
+	@docker compose start
 
 ## stop	:	Stop containers.
 .PHONY: stop
 stop:
 	@echo "Stopping containers for $(PROJECT_NAME)..."
-	@docker-compose stop
+	@docker compose stop
 
 ## prune	:	Remove containers and their volumes.
 ##		You can optionally pass an argument with the service name to prune single container
@@ -49,7 +49,7 @@ stop:
 .PHONY: prune
 prune:
 	@echo "Removing containers for $(PROJECT_NAME)..."
-	@docker-compose down -v $(filter-out $@,$(MAKECMDGOALS))
+	@docker compose down -v $(filter-out $@,$(MAKECMDGOALS))
 
 ## ps	:	List running containers.
 .PHONY: ps
@@ -82,7 +82,7 @@ drush:
 ##		logs nginx php	: View `nginx` and `php` containers logs.
 .PHONY: logs
 logs:
-	@docker-compose logs -f $(filter-out $@,$(MAKECMDGOALS))
+	@docker compose logs -f $(filter-out $@,$(MAKECMDGOALS))
 
 # https://stackoverflow.com/a/6273809/1826109
 %:
diff --git a/tests/10/docker-compose.yml b/tests/10/compose.yml
similarity index 100%
rename from tests/10/docker-compose.yml
rename to tests/10/compose.yml
diff --git a/tests/7/docker-compose.yml b/tests/7/compose.yml
similarity index 100%
rename from tests/7/docker-compose.yml
rename to tests/7/compose.yml