diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 72c7cc1..4901871 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -2,7 +2,7 @@
 Hi there - thanks for filling an issue. Please ensure the following things before creating an issue - thank you! 🤓
 
 - Check the repository. Please only create issue here that concern the Zammad Docker setup. Use the other repositories for other issues.
-- Make sure to use the latest version of Zammads Docker containers via: docker-compose pull
+- Make sure to use the latest version of Zammad's Docker containers via: docker compose pull
 - Please write the issue in english
 
 * The upper textblock will be removed automatically when you submit your issue *
diff --git a/.github/tests.sh b/.github/tests.sh
index e75690c..68ddf3d 100755
--- a/.github/tests.sh
+++ b/.github/tests.sh
@@ -6,7 +6,7 @@
 set -o errexit
 set -o pipefail
 
-docker-compose logs --timestamps --follow &
+docker compose logs --timestamps --follow &
 
 until (curl -I --silent --fail localhost:8080 | grep -iq "HTTP/1.1 200 OK"); do
     echo "wait for zammad to be ready..."
diff --git a/.github/workflows/ci-remote-image.yaml b/.github/workflows/ci-remote-image.yaml
index 6bd9bba..86c72ff 100644
--- a/.github/workflows/ci-remote-image.yaml
+++ b/.github/workflows/ci-remote-image.yaml
@@ -14,11 +14,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: pull docker-compose images
-        run: docker-compose pull
+      - name: pull docker compose images
+        run: docker compose pull
 
-      - name: run docker-compose up
-        run: docker-compose up --detach
+      - name: run docker compose up
+        run: docker compose up --detach
 
       - name: add autowizard file
         run: docker cp .github/auto_wizard.json zammad-docker-compose_zammad-railsserver_1:/opt/zammad/tmp
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3a96236..47086e8 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -13,8 +13,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: lint zammad docker-compose file
-        run: docker-compose config
+      - name: lint zammad docker compose file
+        run: docker compose config
 
   super-linter:
     runs-on: ubuntu-22.04
diff --git a/README.md b/README.md
index 4d3fab8..96eac71 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ To run Zammad behind a reverse proxy, we provide `docker-compose.proxy-example.y
 1. Copy `./.examples/proxy/docker-compose.proxy-example.yml` to your own configuration, e.g. `./docker-compose.prod.yml`
     `cp ./.examples/proxy/docker-compose.proxy-example.yml ./docker-compose.prod.yml`
 2. Modify the environment variable `VIRTUAL_HOST` and the name of the external network in `./docker-compose.prod.yml` to fit your environment.
-3. Run docker-composer commands with the default and your configuration, e.g. `docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d`
+3. Run docker-composer commands with the default and your configuration, e.g. `docker compose -f docker-compose.yml -f docker-compose.prod.yml up -d`
 
 See `.examples/proxy/docker-compose.yml` for an example proxy project.