diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73e33ed51d..0261a38c2a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -561,3 +561,27 @@ jobs:
           aws s3 cp --acl private ./amps/ags/rm-automation/rm-automation-community-rest-api/target/reports/rm-automation-community-rest-api.log s3://ags-travis-artifacts/community/${{ github.run_number }}/AGS-Community-Rest-API-Tests/rm-automation-community-rest-api.log
       - name: "Clean Maven cache"
         run: bash ./scripts/ci/cleanup_cache.sh
+
+  ags_start_api_explorer:
+    name: "Test Tomcat deployment of api explorer"
+    runs-on: ubuntu-latest
+    needs: [ prepare ]
+    if: >
+      (((github.ref_name == 'master' || startsWith(github.ref_name, 'release/') || github.event_name == 'pull_request' ) &&
+      !contains(github.event.head_commit.message, '[skip ags]')) ||
+      contains(github.event.head_commit.message, '[ags]')) &&
+      !contains(github.event.head_commit.message, '[skip tests]') &&
+      !contains(github.event.head_commit.message, '[force]')
+    steps:
+      - uses: actions/checkout@v3
+      - uses: Alfresco/alfresco-build-tools/.github/actions/get-build-info@v1.33.0
+      - uses: Alfresco/alfresco-build-tools/.github/actions/setup-java-build@v1.33.0
+      - name: "Build"
+        timeout-minutes: ${{ fromJSON(env.GITHUB_ACTIONS_DEPLOY_TIMEOUT) }}
+        run: |
+          bash ./scripts/ci/init.sh
+          bash ./scripts/ci/build.sh
+      - name: "Test Tomcat deployment"
+        run: |
+          mvn verify -Pags,start-api-explorer -DskipTests &
+          ${{ env.TAS_SCRIPTS }}/wait-for-alfresco-start.sh "http://localhost:8085/api-explorer"
diff --git a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
index 63d89e8a6d..597348da27 100644
--- a/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
+++ b/amps/ags/rm-community/rm-community-rest-api-explorer/pom.xml
@@ -36,24 +36,40 @@
          <id>start-api-explorer</id>
          <build>
             <plugins>
-               <plugin>
-                  <groupId>org.apache.tomcat.maven</groupId>
-                  <artifactId>tomcat7-maven-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>run-war</id>
-                        <goals>
-                           <goal>run-war</goal>
-                        </goals>
-                        <phase>verify</phase>
-                     </execution>
-                  </executions>
-                  <configuration>
-                     <useSeparateTomcatClassLoader>true</useSeparateTomcatClassLoader>
-                     <path>/api-explorer</path>
-                     <port>8085</port>
-                  </configuration>
-               </plugin>
+                <plugin>
+                    <groupId>org.codehaus.cargo</groupId>
+                    <artifactId>cargo-maven3-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>run-war</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>run</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <container>
+                            <containerId>tomcat9x</containerId>
+                            <type>embedded</type>
+                            <log>target/cargo.log</log>
+                        </container>
+                        <configuration>
+                            <properties>
+                                <cargo.servlet.port>8085</cargo.servlet.port>
+                            </properties>
+                        </configuration>
+                        <deployables>
+                            <deployable>
+                                <type>war</type>
+                                <properties>
+                                    <context>/api-explorer</context>
+                                </properties>
+                                <pingURL>http://localhost:8085/api-explorer</pingURL>
+                            </deployable>
+                        </deployables>
+                    </configuration>
+                </plugin>
             </plugins>
          </build>
       </profile>
diff --git a/pom.xml b/pom.xml
index 975f314605..8f905f275b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1003,6 +1003,11 @@
                         <skipDeploy>true</skipDeploy>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.cargo</groupId>
+                    <artifactId>cargo-maven3-plugin</artifactId>
+                    <version>1.10.7</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>