diff --git a/.github/workflows/build_deploy_edge.yml b/.github/workflows/build_deploy_edge.yml
index 1681d91a..f5dd323e 100644
--- a/.github/workflows/build_deploy_edge.yml
+++ b/.github/workflows/build_deploy_edge.yml
@@ -46,6 +46,8 @@ jobs:
           role-to-assume: ${{ vars.AWS_ROLE_ARN }}
 
       - name: Build with Maven
+        env:
+          DOCKER_API_VERSION: '1.44'
         run: mvn -B verify --file pom.xml
 
       - name: Login to ECR
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 510aa52f..ace1da4f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,6 +42,8 @@ jobs:
           cache: 'maven'
 
       - name: Build with Maven
+        env:
+          DOCKER_API_VERSION: '1.44'
         run: mvn clean -B verify --file pom.xml
 
       - name: Build Docker Image
diff --git a/pom.xml b/pom.xml
index 8f401a87..e01038cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,12 +115,12 @@
 				<artifactId>jackson-databind-nullable</artifactId>
 				<version>0.2.6</version>
 			</dependency>
+			<!-- Source: https://mvnrepository.com/artifact/org.testcontainers/elasticsearch -->
 			<dependency>
 				<groupId>org.testcontainers</groupId>
-				<artifactId>elasticsearch</artifactId>
-				<version>1.21.3</version>
-				<type>pom</type>
-				<scope>import</scope>
+				<artifactId>testcontainers-elasticsearch</artifactId>
+				<version>2.0.2</version>
+				<scope>test</scope>
 			</dependency>
             <!-- EhCache 3.x -->
             <dependency>