diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1daafcd..1408c13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -407,10 +407,10 @@
 > :warning: **UPGRADE NOTES**
 > As the Docker container now runs as a non-root user, you have to first stop the container and change permissions to `data` volume:
 > ```
-> docker-compose stop
+> docker compose stop
 > chown -R ${PUID}:${PGID} data/
-> docker-compose pull
-> docker-compose up -d
+> docker compose pull
+> docker compose up -d
 > ```
 
 ## 1.57-RC1 (2019/10/30)
@@ -470,7 +470,7 @@
 
 > :warning: **UPGRADE NOTES**
 > Sidecar cron and syslog-ng are now respectively handled with `SIDECAR_CRON` and `SIDECAR_SYSLOGNG` env vars
-> See docker-compose example and README for more info.
+> See compose example and README for more info.
 
 ## 1.51-RC1 (2019/05/01)
 
diff --git a/README.md b/README.md
index ad22787..4a98ce0 100644
--- a/README.md
+++ b/README.md
@@ -263,9 +263,9 @@ To upgrade to the latest version of LibreNMS, pull the newer image and launch
 the container. LibreNMS will upgrade automatically:
 
 ```console
-$ docker-compose down
-$ docker-compose pull
-$ docker-compose up -d
+$ docker compose down
+$ docker compose pull
+$ docker compose up -d
 ```
 
 ## Configuration Management
@@ -288,7 +288,7 @@ and will override the default values.
 You can edit the running configuration via the LibreNMS web UI or `lnms config:set`
 
 ```bash
-docker-compose exec librenms lnms config:set page_refresh 300
+docker compose exec librenms lnms config:set page_refresh 300
 ```
 
 ### Re-Apply YAML Config
@@ -317,7 +317,7 @@ If you want to use the `lnms` command to perform common server operations like
 manage users, database migration, and more, type:
 
 ```console
-$ docker-compose exec librenms lnms
+$ docker compose exec librenms lnms
 ```
 
 ### Validate
@@ -326,7 +326,7 @@ If you want to validate your installation from the CLI, type the following
 command:
 
 ```console
-$ docker-compose exec --user librenms librenms php validate.php
+$ docker compose exec --user librenms librenms php validate.php
 ====================================
 Component | Version
 --------- | -------
@@ -350,8 +350,8 @@ SNMP      | NET-SNMP 5.8
 
 If you want to enable the new [Dispatcher service](https://docs.librenms.org/Extensions/Dispatcher-Service/),
 you have to run a "sidecar" container (see dispatcher service in
-[docker-compose.yml](examples/compose/docker-compose.yml) example) or run a
-simple container like this:
+[compose.yml](examples/compose/compose.yml) example) or run a simple container
+like this:
 
 ```console
 $ docker run -d --name librenms_dispatcher \
@@ -369,8 +369,8 @@ $ docker run -d --name librenms_dispatcher \
 ### Syslog-ng container
 
 If you want to enable syslog-ng, you have to run a "sidecar" container (see
-syslog-ng service in [docker-compose.yml](examples/compose/docker-compose.yml)
-example) or run a simple container like this:
+syslog-ng service in [compose.yml](examples/compose/compose.yml) example) or
+run a simple container like this:
 
 ```console
 $ docker run -d --name librenms_syslog \
@@ -395,8 +395,8 @@ enable_syslog: true
 ### Snmptrapd container
 
 If you want to enable snmptrapd, you have to run a "sidecar" container (see
-snmptrapd service in [docker-compose.yml](examples/compose/docker-compose.yml)
-example) or run a simple container like this:
+snmptrapd service in [compose.yml](examples/compose/compose.yml) example) or
+run a simple container like this:
 
 ```console
 $ docker run -d --name librenms_snmptrapd \
diff --git a/examples/compose/docker-compose.yml b/examples/compose/compose.yml
similarity index 100%
rename from examples/compose/docker-compose.yml
rename to examples/compose/compose.yml
diff --git a/examples/rrdcached-server/docker-compose.yml b/examples/rrdcached-server/compose.yml
similarity index 100%
rename from examples/rrdcached-server/docker-compose.yml
rename to examples/rrdcached-server/compose.yml
diff --git a/examples/traefik/docker-compose.yml b/examples/traefik/compose.yml
similarity index 100%
rename from examples/traefik/docker-compose.yml
rename to examples/traefik/compose.yml
diff --git a/test/docker-compose.yml b/test/compose.yml
similarity index 100%
rename from test/docker-compose.yml
rename to test/compose.yml