diff --git a/.github/actions/run-integration-tests/src/integration.ts b/.github/actions/run-integration-tests/src/integration.ts
index ab0d690abc46..bf990e752015 100644
--- a/.github/actions/run-integration-tests/src/integration.ts
+++ b/.github/actions/run-integration-tests/src/integration.ts
@@ -85,14 +85,14 @@ export const COMMANDS: Commands = {
 }
 
 const START_DEPENDENCIES_CMD: Command = {
-  cmd: 'docker-compose',
+  cmd: 'docker compose',
   args: ['-f', 'open-distro-compose.yml', '-f', `${dbType}-compose.yml`, 'up'],
   workingDir: dockerFolder,
   env: DEPS_ENV[dbType as keyof DatabaseEnvs]
 }
 
 const STOP_DEPENDENCIES_CMD: Command = {
-  cmd: 'docker-compose',
+  cmd: 'docker compose',
   args: ['-f', 'open-distro-compose.yml', '-f', `${dbType}-compose.yml`, 'down'],
   workingDir: dockerFolder,
   env: DEPS_ENV[dbType as keyof DatabaseEnvs]
diff --git a/.github/actions/run-postman-tests/src/postman.ts b/.github/actions/run-postman-tests/src/postman.ts
index c1fb4ad7f11c..82c2f1e23182 100644
--- a/.github/actions/run-postman-tests/src/postman.ts
+++ b/.github/actions/run-postman-tests/src/postman.ts
@@ -130,13 +130,13 @@ const startDeps = async () => {
     =======================================`)
 
   if (includeAnalytics) {
-    execCmdAsync(toCommand('docker-compose', ['-f', 'analytics-compose.yml', 'up'], dockerFolder))
+    execCmdAsync(toCommand('docker compose', ['-f', 'analytics-compose.yml', 'up'], dockerFolder))
     await waitFor(140, 'Analytics Infrastructure')
   }
 
   execCmdAsync(
     toCommand(
-      'docker-compose',
+      'docker compose',
       ['-f', 'open-distro-compose.yml', '-f', `${dbType}-compose.yml`, '-f', 'dotcms-compose.yml', 'up'],
       dockerFolder,
       DEPS_ENV
@@ -155,7 +155,7 @@ const stopDeps = async () => {
     ===================================`)
   if (includeAnalytics) {
     try {
-      await execCmd(toCommand('docker-compose', ['-f', 'analytics-compose.yml', 'down', '-v'], dockerFolder))
+      await execCmd(toCommand('docker compose', ['-f', 'analytics-compose.yml', 'down', '-v'], dockerFolder))
     } catch (err) {
       console.error(`Error stopping dependencies: ${err}`)
     }
@@ -164,7 +164,7 @@ const stopDeps = async () => {
   try {
     await execCmd(
       toCommand(
-        'docker-compose',
+        'docker compose',
         ['-f', 'open-distro-compose.yml', '-f', `${dbType}-compose.yml`, '-f', 'dotcms-compose.yml', 'down', '-v'],
         dockerFolder,
         DEPS_ENV
diff --git a/cicd/local-cicd.sh b/cicd/local-cicd.sh
index fade5400b837..ddd7f8a75f13 100644
--- a/cicd/local-cicd.sh
+++ b/cicd/local-cicd.sh
@@ -69,7 +69,7 @@ function startDependencies {
   local test_type=${1}
   echo "Starting ${test_type} dependencies"
 
-  executeCmd "docker-compose
+  executeCmd "docker compose
     -f open-distro-compose.yml
     -f ${INPUT_DB_TYPE}-compose.yml
     up
@@ -83,7 +83,7 @@ function stopDependencies {
   local test_type=${1}
   echo "Stopping ${test_type} dependencies"
 
-  executeCmd "docker-compose
+  executeCmd "docker compose
     -f open-distro-compose.yml
     -f ${INPUT_DB_TYPE}-compose.yml
     down"
diff --git a/core-web/package.json b/core-web/package.json
index fb2ba56f66ee..e2a917101b8c 100644
--- a/core-web/package.json
+++ b/core-web/package.json
@@ -23,7 +23,7 @@
         "build:prod": "nx run dotcms-ui:build:production",
         "build:dotcms-block-editor": "ng build dotcms-block-editor --configuration production --optimization --output-hashing=none && cat dist/apps/dotcms-block-editor/{generator-runtime,runtime,polyfills,main}.js > ../dotCMS/src/main/webapp/html/dotcms-block-editor.js",
         "build:dotcms-webcomponents": "nx build dotcms-webcomponents",
-        "docker:test": "npm run docker:build;IMAGE_BASE_NAME=core-web docker-compose -f docker-compose-running-test.yml up",
+        "docker:test": "npm run docker:build;IMAGE_BASE_NAME=core-web docker compose -f docker-compose-running-test.yml up",
         "docker:build": "docker build -t core-web .",
         "analyze": "ng build --stats-json;webpack-bundle-analyzer dist/stats.json",
         "docs:json": "compodoc -p ./tsconfig.base.json -e json -d .",
diff --git a/dotCMS/src/main/enterprise b/dotCMS/src/main/enterprise
index 8690330f9e2a..87e4fb46dc41 160000
--- a/dotCMS/src/main/enterprise
+++ b/dotCMS/src/main/enterprise
@@ -1 +1 @@
-Subproject commit 8690330f9e2a12fd58d6169c0381f0aaf41bdfc9
+Subproject commit 87e4fb46dc41b3d19fc7f063ef65b7bde2279902