diff --git a/.github/workflows/run-tests-pebble.yml b/.github/workflows/run-tests-pebble.yml
index 1d707e82..4159336f 100644
--- a/.github/workflows/run-tests-pebble.yml
+++ b/.github/workflows/run-tests-pebble.yml
@@ -18,103 +18,103 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Alpine
         run: test/run-test.sh alpine
   test-bash-4-0:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Alpine using Bash 4.0
         run: test/run-test.sh bash4-0
   test-bash-4-2:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Alpine using Bash 4.2
         run: test/run-test.sh bash4-2
   test-bash-5-0:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Alpine using Bash 5
         run: test/run-test.sh bash5-0
   test-centos6:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on CentOS6
         run: test/run-test.sh centos6
   test-centos7:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on CentOS7
         run: test/run-test.sh centos7
   test-centos8:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on CentOS8
         run: test/run-test.sh centos8
   test-debian:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Debian
         run: test/run-test.sh debian
   test-rockylinux8:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on RockyLinux8
         run: test/run-test.sh rockylinux8
   test-ubuntu:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Ubuntu
         run: test/run-test.sh ubuntu
   test-ubuntu14:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Ubuntu14
         run: test/run-test.sh ubuntu14
   test-ubuntu16:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Ubuntu16
         run: test/run-test.sh ubuntu16
   test-ubuntu18:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Ubuntu18
         run: test/run-test.sh ubuntu18
diff --git a/.github/workflows/run-tests-staging-acmedns.yml b/.github/workflows/run-tests-staging-acmedns.yml
index fd4897d0..9ca1ee26 100644
--- a/.github/workflows/run-tests-staging-acmedns.yml
+++ b/.github/workflows/run-tests-staging-acmedns.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Ubuntu against Staging using acmedns
         run: test/run-test.sh ubuntu-acmedns
diff --git a/.github/workflows/run-tests-staging-duckdns.yml b/.github/workflows/run-tests-staging-duckdns.yml
index 4bf0caf2..c937e8a2 100644
--- a/.github/workflows/run-tests-staging-duckdns.yml
+++ b/.github/workflows/run-tests-staging-duckdns.yml
@@ -10,8 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on CentOS7 against Staging using DuckDNS
         run: test/run-test.sh centos7-duckdns
   test-ubuntu-duckdns:
@@ -20,7 +20,7 @@ jobs:
     needs: test-centos7-duckdns
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Ubuntu against Staging using DuckDNS
         run: test/run-test.sh ubuntu-duckdns
diff --git a/.github/workflows/run-tests-staging-dynu.yml b/.github/workflows/run-tests-staging-dynu.yml
index 8cc147e8..7cc769bf 100644
--- a/.github/workflows/run-tests-staging-dynu.yml
+++ b/.github/workflows/run-tests-staging-dynu.yml
@@ -10,8 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on CentOS7 against Staging using Dynu
         run: test/run-test.sh centos7-dynu
   test-ubuntu-dynu:
@@ -20,7 +20,7 @@ jobs:
     needs: test-centos7-dynu
     steps:
       - uses: actions/checkout@v3
-      - name: Build the docker-compose stack
-        run: docker-compose up -d --build
+      - name: Build the docker compose stack
+        run: docker compose up -d --build
       - name: Run test suite on Ubuntu against Staging using Dynu
         run: test/run-test.sh ubuntu-dynu
diff --git a/test/README-Testing.md b/test/README-Testing.md
index 99365411..3d156b1d 100644
--- a/test/README-Testing.md
+++ b/test/README-Testing.md
@@ -6,7 +6,7 @@ For continuous integration testing we have the following:
 
 `gitactions` script which runs whenever a PR is pushed:
 
-1. Uses `docker-compose` to start `pebble` (letsencrypt test server) and `challtestsrv` (minimal dns client for pebble)
+1. Uses `docker compose` to start `pebble` (letsencrypt test server) and `challtestsrv` (minimal dns client for pebble)
 2. Then runs the `bats` test scripts (all the files with a ".bats" extension) for each OS (alpine, centos6, debian, ubuntu)
 3. Runs the `bats` test script against the staging server (using ubuntu docker image and duckdns.org)
 
@@ -29,19 +29,19 @@ For individual accounts, <reponame> is your github account name.
 
 ## To run all the tests on a single OS
 
-1. Start `pebble` and `challtestsrv` using ```docker-compose up -d --build```
+1. Start `pebble` and `challtestsrv` using ```docker compose up -d --build```
 2. Run the test suite ```test/run-test.sh [<os>]```
 3. eg. `test/run-test.sh ubuntu16`
 
 ## To run a single bats test on a single OS
 
-1. Start `pebble` and `challtestsrv` using ```docker-compose up -d --build```
+1. Start `pebble` and `challtestsrv` using ```docker compose up -d --build```
 2. ```test/run-test.sh <os> bats <bats test script>```
 3. e.g. `test/run-test.sh ubuntu bats /getssl/test/1-simple-http01.bats`
 
 ## To debug a test
 
-1. Start `pebble` and `challtestsrv` using ```docker-compose up -d --build```
+1. Start `pebble` and `challtestsrv` using ```docker compose up -d --build```
 2. ```run-test.sh <os> /getssl/test/debug-test.sh <getssl config file>```
 3. e.g. `test/run-test.sh ubuntu /getssl/test/debug-test.sh -d /getssl/test/test-config/getssl-http01-cfg`