diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1e10f20..f917d6e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,7 +2,7 @@ defaults: &defaults
   working_directory: /home/circleci/.go_workspace/src/github.com/gruntwork-io/gruntwork-installer
   machine:
     enabled: true
-    image: ubuntu-2004:202111-02
+    image: ubuntu-2204:2022.04.1
 version: 2
 jobs:
   test:
diff --git a/test/amazonlinux/docker-compose.yml b/test/amazonlinux/docker-compose.yml
index 28b44a5..034bbf2 100644
--- a/test/amazonlinux/docker-compose.yml
+++ b/test/amazonlinux/docker-compose.yml
@@ -1,10 +1,11 @@
-installer:
-  image: gruntwork/gruntwork-installer-amazonlinux
-  volumes:
-    # Mount the scripts in the root directory under /src
-    - ../../:/src
-    # Mount the test code in this directory under /test
-    - ../:/test
-  environment:
-    # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
-    - GITHUB_OAUTH_TOKEN
+services:
+  installer:
+    image: gruntwork/gruntwork-installer-amazonlinux
+    volumes:
+      # Mount the scripts in the root directory under /src
+      - ../../:/src
+      # Mount the test code in this directory under /test
+      - ../:/test
+    environment:
+      # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
+      - GITHUB_OAUTH_TOKEN
diff --git a/test/centos/docker-compose.yml b/test/centos/docker-compose.yml
index 6a9da7a..9835654 100644
--- a/test/centos/docker-compose.yml
+++ b/test/centos/docker-compose.yml
@@ -1,10 +1,11 @@
-installer:
-  image: gruntwork/gruntwork-installer-centos
-  volumes:
-    # Mount the scripts in the root directory under /src
-    - ../../:/src
-    # Mount the test code in this directory under /test
-    - ../:/test
-  environment:
-    # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
-    - GITHUB_OAUTH_TOKEN
+services:
+  installer:
+    image: gruntwork/gruntwork-installer-centos
+    volumes:
+      # Mount the scripts in the root directory under /src
+      - ../../:/src
+      # Mount the test code in this directory under /test
+      - ../:/test
+    environment:
+      # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
+      - GITHUB_OAUTH_TOKEN
diff --git a/test/no_sudo/docker-compose.yml b/test/no_sudo/docker-compose.yml
index bf93a3f..fa3ebc8 100644
--- a/test/no_sudo/docker-compose.yml
+++ b/test/no_sudo/docker-compose.yml
@@ -1,10 +1,11 @@
-installer:
-  image: gruntwork/gruntwork-installer-no-sudo-ubuntu
-  volumes:
-    # Mount the scripts in the root directory under /src
-    - ../../:/src
-    # Mount the test code in this directory under /test
-    - ../:/test
-  environment:
-    # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
-    - GITHUB_OAUTH_TOKEN
+services:
+  installer:
+    image: gruntwork/gruntwork-installer-no-sudo-ubuntu
+    volumes:
+      # Mount the scripts in the root directory under /src
+      - ../../:/src
+      # Mount the test code in this directory under /test
+      - ../:/test
+    environment:
+      # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
+      - GITHUB_OAUTH_TOKEN
diff --git a/test/ubuntu/docker-compose.yml b/test/ubuntu/docker-compose.yml
index 0cfd1f5..473eb05 100644
--- a/test/ubuntu/docker-compose.yml
+++ b/test/ubuntu/docker-compose.yml
@@ -1,10 +1,11 @@
-installer:
-  image: gruntwork/gruntwork-installer-ubuntu
-  volumes:
-    # Mount the scripts in the root directory under /src
-    - ../../:/src
-    # Mount the test code in this directory under /test
-    - ../:/test
-  environment:
-    # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
-    - GITHUB_OAUTH_TOKEN
+services:
+  installer:
+    image: gruntwork/gruntwork-installer-ubuntu
+    volumes:
+      # Mount the scripts in the root directory under /src
+      - ../../:/src
+      # Mount the test code in this directory under /test
+      - ../:/test
+    environment:
+      # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
+      - GITHUB_OAUTH_TOKEN
diff --git a/test/ubuntu18/docker-compose.yml b/test/ubuntu18/docker-compose.yml
index 943e568..477277c 100644
--- a/test/ubuntu18/docker-compose.yml
+++ b/test/ubuntu18/docker-compose.yml
@@ -1,10 +1,11 @@
-installer:
-  image: gruntwork/gruntwork-installer-ubuntu18
-  volumes:
-    # Mount the scripts in the root directory under /src
-    - ../../:/src
-    # Mount the test code in this directory under /test
-    - ../:/test
-  environment:
-    # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
-    - GITHUB_OAUTH_TOKEN
+services:
+  installer:
+    image: gruntwork/gruntwork-installer-ubuntu18
+    volumes:
+      # Mount the scripts in the root directory under /src
+      - ../../:/src
+      # Mount the test code in this directory under /test
+      - ../:/test
+    environment:
+      # Forward the GITHUB_OAUTH_TOKEN as an environment variable from the user's environment
+      - GITHUB_OAUTH_TOKEN