diff --git a/pom.xml b/pom.xml
index 834c999..2d85f29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>de.acosix.alfresco.maven</groupId>
         <artifactId>de.acosix.alfresco.maven.project.parent-6.0.7</artifactId>
-        <version>1.4.0</version>
+        <version>1.4.1</version>
     </parent>
 
     <groupId>de.acosix.alfresco.keycloak</groupId>
@@ -81,6 +81,26 @@
 
         <acosix.utility.version>1.2.5</acosix.utility.version>
         <ootbee.support-tools.version>1.1.0.0</ootbee.support-tools.version>
+
+        <docker.tests.repositoryImageBuilder.preRun></docker.tests.repositoryImageBuilder.preRun>
+        <docker.tests.repositoryImageBuilder.postRun></docker.tests.repositoryImageBuilder.postRun>
+
+        <!-- for when we run tests with ACS 7.0+ -->
+        <activemq.version>5.16.1</activemq.version>
+
+        <!-- Uncomment to test with latest release(s) -->
+        <!--
+        <docker.tests.repositoryBaseImage>alfresco/alfresco-content-repository-community:7.0.0</docker.tests.repositoryBaseImage>
+        <docker.tests.shareBaseImage>alfresco/alfresco-share:7.0.0</docker.tests.shareBaseImage>
+        <docker.tests.searchBaseImage>alfresco/alfresco-search-services:2.0.0.1</docker.tests.searchBaseImage>
+
+        <docker.tests.repositoryVersionSpecificJavaOpts><![CDATA[-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${docker.tests.repositoryDebugPort} -Dencryption.keystore.type=JCEKS -Dencryption.cipherAlgorithm=DESede/CBC/PKCS5Padding -Dencryption.keyAlgorithm=DESede -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore -Dmetadata-keystore.password=mp6yc0UD9e -Dmetadata-keystore.aliases=metadata -Dmetadata-keystore.metadata.password=oKIWzVdEdA -Dmetadata-keystore.metadata.algorithm=DESede -Dmessaging.broker.url=vm://localhost?broker.persistent=false]]></docker.tests.repositoryVersionSpecificJavaOpts>
+        <docker.tests.shareVersionSpecificJavaOpts>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:${docker.tests.shareDebugPort}</docker.tests.shareVersionSpecificJavaOpts>
+
+        <docker.tests.repositoryImageBuilder.preRun>USER root</docker.tests.repositoryImageBuilder.preRun>
+        <docker.tests.repositoryImageBuilder.postRun>USER alfresco</docker.tests.repositoryImageBuilder.postRun>
+        <acosix.utility.version>1.3.0-SNAPSHOT</acosix.utility.version>
+        -->
     </properties>
 
     <dependencyManagement>
@@ -247,6 +267,21 @@
                 <version>${ootbee.support-tools.version}</version>
                 <scope>test</scope>
             </dependency>
+
+            <!-- relevant to support vm: transport for non-AMQ-Docker setup -->
+            <!-- transitive dependencies are already part of ACS -->
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-broker</artifactId>
+                <version>${activemq.version}</version>
+                <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/repository/pom.xml b/repository/pom.xml
index 8838850..0f19427 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -147,6 +147,11 @@
             <artifactId>support-tools-repo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-broker</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -167,9 +172,6 @@
                             <image>
                                 <!-- customise repository image (second image in parent POM) -->
                                 <run>
-                                    <env>
-                                        <DOCKER_HOST_NAME>${docker.tests.host.name}</DOCKER_HOST_NAME>
-                                    </env>
                                     <!-- add log directory mount to just the contentstore -->
                                     <!-- (cannot be done in parent POM due to hard requirement on specific project structure -->
                                     <!-- for tests to easily check contentstore files, we also mount alf_data locally, not in a volume -->
diff --git a/repository/src/test/docker/Repository-Dockerfile b/repository/src/test/docker/Repository-Dockerfile
index c634fd6..476d1da 100644
--- a/repository/src/test/docker/Repository-Dockerfile
+++ b/repository/src/test/docker/Repository-Dockerfile
@@ -1,12 +1,12 @@
 FROM ${docker.tests.repositoryBaseImage}
 COPY maven ${docker.tests.repositoryWebappPath}
 
+${docker.tests.repositoryImageBuilder.preRun}
+
 # merge additions to alfresco-global.properties
 RUN echo "" >> ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
     && echo "#MergeGlobalProperties" >> ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
     && sed -i '/#MergeGlobalProperties/r ${docker.tests.repositoryWebappPath}/WEB-INF/classes/alfresco/extension/alfresco-global.addition.properties' ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
-    && sed -i 's/<secure>true<\/secure>/<secure>false<\/secure>/' $CATALINA_HOME/conf/web.xml \
-    && mv ${docker.tests.repositoryWebappPath}/WEB-INF/classes/alfresco/extension/entrypoint.sh $CATALINA_HOME/bin/ \
-    && chmod +x $CATALINA_HOME/bin/entrypoint.sh
+    && sed -i 's/<secure>true<\/secure>/<secure>false<\/secure>/' $CATALINA_HOME/conf/web.xml
     
-CMD ["entrypoint.sh", "catalina.sh run -security"]
\ No newline at end of file
+${docker.tests.repositoryImageBuilder.postRun}
\ No newline at end of file
diff --git a/repository/src/test/docker/alfresco/extension/entrypoint.sh b/repository/src/test/docker/alfresco/extension/entrypoint.sh
deleted file mode 100644
index 4d81e7a..0000000
--- a/repository/src/test/docker/alfresco/extension/entrypoint.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ip=`hostname -I | awk '{print $1}'`
-hostip=`echo "${ip}" | sed -E 's/([0-9]+\.[0-9]+)\.0\.[0-9]+/\1.0.1/'`
-hostname="${DOCKER_HOST_NAME}"
-echo "${hostip}   ${hostname}" >> /etc/hosts
-
-bash -c "$@"
\ No newline at end of file
diff --git a/repository/src/test/docker/repository-it.xml b/repository/src/test/docker/repository-it.xml
index 9556714..13d40a8 100644
--- a/repository/src/test/docker/repository-it.xml
+++ b/repository/src/test/docker/repository-it.xml
@@ -88,6 +88,7 @@
                 <include>org.orderofthebee.support-tools:*</include>
                 <include>com.cronutils:*</include>
                 <include>net.time4j:*</include>
+                <include>org.apache.activemq:activemq-broker</include>
                 <include>de.acosix.alfresco.utility:de.acosix.alfresco.utility.common:*</include>
                 <include>de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.repo.quartz1:*</include>
                 <include>de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.repo.quartz2:*</include>
diff --git a/share/pom.xml b/share/pom.xml
index 64dfaa0..ce5fe34 100644
--- a/share/pom.xml
+++ b/share/pom.xml
@@ -188,6 +188,11 @@
             <artifactId>jcl-over-slf4j</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-broker</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/share/src/test/docker/Repository-Dockerfile b/share/src/test/docker/Repository-Dockerfile
index c634fd6..476d1da 100644
--- a/share/src/test/docker/Repository-Dockerfile
+++ b/share/src/test/docker/Repository-Dockerfile
@@ -1,12 +1,12 @@
 FROM ${docker.tests.repositoryBaseImage}
 COPY maven ${docker.tests.repositoryWebappPath}
 
+${docker.tests.repositoryImageBuilder.preRun}
+
 # merge additions to alfresco-global.properties
 RUN echo "" >> ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
     && echo "#MergeGlobalProperties" >> ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
     && sed -i '/#MergeGlobalProperties/r ${docker.tests.repositoryWebappPath}/WEB-INF/classes/alfresco/extension/alfresco-global.addition.properties' ${docker.tests.repositoryWebappPath}/../../shared/classes/alfresco-global.properties \
-    && sed -i 's/<secure>true<\/secure>/<secure>false<\/secure>/' $CATALINA_HOME/conf/web.xml \
-    && mv ${docker.tests.repositoryWebappPath}/WEB-INF/classes/alfresco/extension/entrypoint.sh $CATALINA_HOME/bin/ \
-    && chmod +x $CATALINA_HOME/bin/entrypoint.sh
+    && sed -i 's/<secure>true<\/secure>/<secure>false<\/secure>/' $CATALINA_HOME/conf/web.xml
     
-CMD ["entrypoint.sh", "catalina.sh run -security"]
\ No newline at end of file
+${docker.tests.repositoryImageBuilder.postRun}
\ No newline at end of file
diff --git a/share/src/test/docker/alfresco/extension/entrypoint.sh b/share/src/test/docker/alfresco/extension/entrypoint.sh
deleted file mode 100644
index 4d81e7a..0000000
--- a/share/src/test/docker/alfresco/extension/entrypoint.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-ip=`hostname -I | awk '{print $1}'`
-hostip=`echo "${ip}" | sed -E 's/([0-9]+\.[0-9]+)\.0\.[0-9]+/\1.0.1/'`
-hostname="${DOCKER_HOST_NAME}"
-echo "${hostip}   ${hostname}" >> /etc/hosts
-
-bash -c "$@"
\ No newline at end of file
diff --git a/share/src/test/docker/alfresco/web-extension/share-config-custom.xml b/share/src/test/docker/alfresco/web-extension/share-config-custom.xml
index 1f956ab..8357e8a 100644
--- a/share/src/test/docker/alfresco/web-extension/share-config-custom.xml
+++ b/share/src/test/docker/alfresco/web-extension/share-config-custom.xml
@@ -76,7 +76,7 @@
         </keycloak-auth-config>
         <keycloak-adapter-config>
             <directAuthHost>http://keycloak:8080</directAuthHost>
-            <auth-server-url>http://${docker.tests.host.name}:${docker.tests.keycloakPort}/auth</auth-server-url>
+            <auth-server-url>http://localhost:${docker.tests.keycloakPort}/auth</auth-server-url>
             <realm>test</realm>
             <resource>alfresco-share</resource>
             <ssl-required>none</ssl-required>
diff --git a/share/src/test/docker/repository-it.xml b/share/src/test/docker/repository-it.xml
index a6fec4c..2dffdf5 100644
--- a/share/src/test/docker/repository-it.xml
+++ b/share/src/test/docker/repository-it.xml
@@ -64,6 +64,7 @@
                 <!-- this cost me half a day to track down when the following three patterns were sorted last -->
                 <include>com.cronutils:*</include>
                 <include>net.time4j:*</include>
+                <include>org.apache.activemq:activemq-broker</include>
                 <include>org.orderofthebee.support-tools:support-tools-repo:*</include>
                 <include>de.acosix.alfresco.utility:de.acosix.alfresco.utility.common:*</include>
                 <include>de.acosix.alfresco.utility:de.acosix.alfresco.utility.core.repo.quartz1:*</include>