diff --git a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
index fc564446..21f4942a 100644
--- a/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
+++ b/archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
@@ -53,11 +53,13 @@ services:
     ports:
       - "8983:8983"
     volumes:
-      - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/contentstore
       - ${rootArtifactId}-ass-volume:/opt/alfresco-search-services/data
   ${rootArtifactId}-activemq:
       image: alfresco/alfresco-activemq:5.16.1
-      mem_limit: 1g
+      deploy:
+        resources:
+          limits:
+            memory: 1g
       ports:
         - 8161:8161 # Web Console
         - 5672:5672 # AMQP
diff --git a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
index 441d1fd5..1e70735d 100644
--- a/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
+++ b/archetypes/alfresco-share-jar-archetype/src/main/resources/archetype-resources/docker/docker-compose.yml
@@ -33,7 +33,6 @@ services:
 #                -Dtransform.service.enabled=false
 #                -Dlocal.transform.service.enabled=false
 #                -Dlegacy.transform.service.enabled=false
-#                ${symbol_dollar}{keystore.settings}
 #                "
 #    ports:
 #      - "${symbol_dollar}{acs.port}:8080"