diff --git a/as2/src/main/java/org/apache/camel/example/as2/ExamineAS2ServerEndpointExchange.java b/as2/src/main/java/org/apache/camel/example/as2/ExamineAS2ServerEndpointExchange.java
index fb0600889..d988f20ea 100644
--- a/as2/src/main/java/org/apache/camel/example/as2/ExamineAS2ServerEndpointExchange.java
+++ b/as2/src/main/java/org/apache/camel/example/as2/ExamineAS2ServerEndpointExchange.java
@@ -20,8 +20,8 @@
 import org.apache.camel.Processor;
 import org.apache.camel.component.as2.api.util.AS2Utils;
 import org.apache.camel.component.as2.internal.AS2Constants;
-import org.apache.http.HttpRequest;
-import org.apache.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/as2/src/main/resources/META-INF/spring/camel-context.xml b/as2/src/main/resources/META-INF/spring/camel-context.xml
index eef81e525..e16ae4c76 100644
--- a/as2/src/main/resources/META-INF/spring/camel-context.xml
+++ b/as2/src/main/resources/META-INF/spring/camel-context.xml
@@ -70,7 +70,7 @@ UNZ+1+00000000000778'
               </constant>
           </transform>
            <setHeader name="CamelAS2.ediMessageContentType">
-             <simple resultType="org.apache.http.entity.ContentType">application/edifact;charset=US-ASCII</simple>
+             <simple resultType="org.apache.hc.core5.http.ContentType">application/edifact;charset=US-ASCII</simple>
            </setHeader>
 	       <setHeader name="CamelAS2.ediMessageTransferEncoding">
 	         <constant>7bit</constant>
diff --git a/resume-api/resume-api-aws2-kinesis/README.md b/resume-api/resume-api-aws2-kinesis/README.md
index a4e125e9c..9dd98a1a4 100644
--- a/resume-api/resume-api-aws2-kinesis/README.md
+++ b/resume-api/resume-api-aws2-kinesis/README.md
@@ -15,7 +15,7 @@ Building the demo
 To build the demo and the containers:
 
 ```shell
-mvn clean package && docker-compose build
+mvn clean package && docker compose build
 ```
 
 Run
@@ -24,7 +24,7 @@ Run
 To run the demo:
 
 ```shell
-docker-compose up -d && docker-compose logs --no-log-prefix -f example ; docker-compose down
+docker compose up -d && docker compose logs --no-log-prefix -f example ; docker compose down
 ```
 
 Advanced / Manual
diff --git a/resume-api/resume-api-aws2-kinesis/docker-compose.yaml b/resume-api/resume-api-aws2-kinesis/compose.yaml
similarity index 99%
rename from resume-api/resume-api-aws2-kinesis/docker-compose.yaml
rename to resume-api/resume-api-aws2-kinesis/compose.yaml
index 524d8a164..bc0fac29c 100644
--- a/resume-api/resume-api-aws2-kinesis/docker-compose.yaml
+++ b/resume-api/resume-api-aws2-kinesis/compose.yaml
@@ -15,7 +15,6 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-version: '3.4'
 services:
   kinesis:
     image: localstack/localstack:latest
diff --git a/resume-api/resume-api-cassandraql/README.md b/resume-api/resume-api-cassandraql/README.md
index 361761868..e3b78eb4c 100644
--- a/resume-api/resume-api-cassandraql/README.md
+++ b/resume-api/resume-api-cassandraql/README.md
@@ -13,7 +13,7 @@ Building the demo
 To build the demo and the containers:
 
 ```shell
-mvn clean package && docker-compose build
+mvn clean package && docker compose build
 ```
 
 Run
@@ -22,7 +22,7 @@ Run
 To run the demo:
 
 ```shell
-docker-compose up -d && docker-compose logs --no-log-prefix -f example ; docker-compose down
+docker compose up -d && docker compose logs --no-log-prefix -f example ; docker compose down
 ```
 
 Advanced / Manual
diff --git a/resume-api/resume-api-cassandraql/docker-compose.yaml b/resume-api/resume-api-cassandraql/compose.yaml
similarity index 99%
rename from resume-api/resume-api-cassandraql/docker-compose.yaml
rename to resume-api/resume-api-cassandraql/compose.yaml
index 2de66f5c9..85f67e02b 100644
--- a/resume-api/resume-api-cassandraql/docker-compose.yaml
+++ b/resume-api/resume-api-cassandraql/compose.yaml
@@ -15,7 +15,6 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-version: '3.4'
 services:
   cassandra:
     image: cassandra:4
diff --git a/resume-api/resume-api-file-offset/README.md b/resume-api/resume-api-file-offset/README.md
index 55406bcc6..e5cb7955e 100644
--- a/resume-api/resume-api-file-offset/README.md
+++ b/resume-api/resume-api-file-offset/README.md
@@ -14,7 +14,7 @@ Building the demo
 To build the demo and the containers:
 
 ```shell
-mvn clean package && docker-compose build
+mvn clean package && docker compose build
 ```
 
 
@@ -25,7 +25,7 @@ Run
 To run the demo:
 
 ```shell
-docker-compose up -d && docker-compose logs --no-log-prefix -f example ; docker-compose down
+docker compose up -d && docker compose logs --no-log-prefix -f example ; docker compose down
 ```
 
 Advanced / Manual
diff --git a/resume-api/resume-api-fileset/docker-compose.yaml b/resume-api/resume-api-file-offset/compose.yaml
similarity index 99%
rename from resume-api/resume-api-fileset/docker-compose.yaml
rename to resume-api/resume-api-file-offset/compose.yaml
index e1ee1bd6d..7b5c3e814 100644
--- a/resume-api/resume-api-fileset/docker-compose.yaml
+++ b/resume-api/resume-api-file-offset/compose.yaml
@@ -15,7 +15,6 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-version: '3.4'
 services:
   zookeeper:
     image: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
diff --git a/resume-api/resume-api-fileset-clusterized/README.md b/resume-api/resume-api-fileset-clusterized/README.md
index fe0fb2480..2373ea6b0 100644
--- a/resume-api/resume-api-fileset-clusterized/README.md
+++ b/resume-api/resume-api-fileset-clusterized/README.md
@@ -38,7 +38,7 @@ Building the demo
 To build the demo and the containers:
 
 ```shell
-mvn clean package && docker-compose build
+mvn clean package && docker compose build
 ```
 
 Run
@@ -47,7 +47,7 @@ Run
 To run the demo:
 
 ```shell
-docker-compose up -d && docker-compose logs -f example-1 example-2 ; docker-compose down
+docker compose up -d && docker compose logs -f example-1 example-2 ; docker compose down
 ```
 
 
diff --git a/resume-api/resume-api-fileset-clusterized/docker-compose.yaml b/resume-api/resume-api-fileset-clusterized/compose.yaml
similarity index 99%
rename from resume-api/resume-api-fileset-clusterized/docker-compose.yaml
rename to resume-api/resume-api-fileset-clusterized/compose.yaml
index a44c1e21b..edd64caae 100644
--- a/resume-api/resume-api-fileset-clusterized/docker-compose.yaml
+++ b/resume-api/resume-api-fileset-clusterized/compose.yaml
@@ -15,7 +15,6 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-version: '3.4'
 services:
   zookeeper:
     image: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
diff --git a/resume-api/resume-api-fileset-wal/README.md b/resume-api/resume-api-fileset-wal/README.md
index 8c3aae02a..c5f947a9f 100644
--- a/resume-api/resume-api-fileset-wal/README.md
+++ b/resume-api/resume-api-fileset-wal/README.md
@@ -14,7 +14,7 @@ Building the demo
 To build the demo and the containers:
 
 ```shell
-mvn clean package && docker-compose build
+mvn clean package && docker compose build
 ```
 
 Run
@@ -23,7 +23,7 @@ Run
 This demo runs manually. First, start the demo using the command:
 
 ```shell
-docker-compose up -d && docker exec -it resume-api-fileset-wal-example-1 /bin/bash ; docker-compose down
+docker compose up -d && docker exec -it resume-api-fileset-wal-example-1 /bin/bash ; docker compose down
 ```
 
 This will take you to another shell. Open another window or terminal and leave that shell open for now. 
@@ -59,7 +59,7 @@ docker network connect --alias kafka resume-api-fileset-wal_default resume-api-f
 While running the demo, note how the application performs the recovery prior to starting the execution. 
 
 
-*Note*: it assumes docker-compose will create the containers using its default name pattern. If that's not the case, 
+*Note*: it assumes docker compose will create the containers using its default name pattern. If that's not the case, 
 please adjust the names accordingly.
 
 
diff --git a/resume-api/resume-api-file-offset/docker-compose.yaml b/resume-api/resume-api-fileset-wal/compose.yaml
similarity index 99%
rename from resume-api/resume-api-file-offset/docker-compose.yaml
rename to resume-api/resume-api-fileset-wal/compose.yaml
index e1ee1bd6d..7b5c3e814 100644
--- a/resume-api/resume-api-file-offset/docker-compose.yaml
+++ b/resume-api/resume-api-fileset-wal/compose.yaml
@@ -15,7 +15,6 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-version: '3.4'
 services:
   zookeeper:
     image: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0
diff --git a/resume-api/resume-api-fileset/README.md b/resume-api/resume-api-fileset/README.md
index 07916b74d..24578af48 100644
--- a/resume-api/resume-api-fileset/README.md
+++ b/resume-api/resume-api-fileset/README.md
@@ -14,7 +14,7 @@ Building the demo
 To build the demo and the containers:
 
 ```shell
-mvn clean package && docker-compose build
+mvn clean package && docker compose build
 ```
 
 Run
@@ -23,5 +23,5 @@ Run
 To run the demo:
 
 ```shell
-docker-compose up -d && docker-compose logs --no-log-prefix -f example ; docker-compose down
+docker compose up -d && docker compose logs --no-log-prefix -f example ; docker compose down
 ```
diff --git a/resume-api/resume-api-fileset-wal/docker-compose.yaml b/resume-api/resume-api-fileset/compose.yaml
similarity index 99%
rename from resume-api/resume-api-fileset-wal/docker-compose.yaml
rename to resume-api/resume-api-fileset/compose.yaml
index e1ee1bd6d..7b5c3e814 100644
--- a/resume-api/resume-api-fileset-wal/docker-compose.yaml
+++ b/resume-api/resume-api-fileset/compose.yaml
@@ -15,7 +15,6 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-version: '3.4'
 services:
   zookeeper:
     image: quay.io/strimzi/kafka:0.28.0-kafka-3.1.0