diff --git a/e2e-test/generator-alfresco-docker-compose/README.md b/e2e-test/generator-alfresco-docker-compose/README.md
index e7a0f445f..664e12ab9 100644
--- a/e2e-test/generator-alfresco-docker-compose/README.md
+++ b/e2e-test/generator-alfresco-docker-compose/README.md
@@ -16,9 +16,11 @@ Following templates are provided.
 $ tree generators/app/templates/
 generators/app/templates/
 ├── 6.1
+│   ├── .env
 │   ├── docker-compose-ce.yml
 │   └── docker-compose-ee.yml
 ├── 6.2
+│   ├── .env
 │   ├── docker-compose-ce.yml
 │   └── docker-compose-ee.yml
 ├── images
@@ -62,14 +64,24 @@ $ yo alfresco-docker-compose
 
 ## ACS Version
 
-Currently supported ACS Version are `6.2` and `6.1`
+Currently supported ACS Versions are `6.2` and `6.1`
 
 This is the first choice to be selected when the generator is executed.
+
 ```
 ? Which ACS version do you want to use?
   6.1
 ❯ 6.2
 ```
+## AGS Version
+
+Currently supported AGS Version is `latest` (based in ACS 6.1).
+
+If you chose ACS 6.1, a prompt will allow you to use AGS.
+
+```
+? Would you like to use AGS? Yes
+```
 
 ## Community
 
@@ -122,6 +134,8 @@ Shard property is `shard:shardId`, belonging to a custom model deployed in the t
 **EXPLICIT_ID** and **EXPLICIT_ID_FALLBACK_LRIS**
 Custom content model is deployed to provide a property, named `shard:shardId`, holding the Shard Number (0, 1) where the content is indexed.
 
+This default configuration can be changed in the generated `docker-compose.yml` template.
+
 ## Configuration catalog
 
 | Version    | Comms | Replication | Sharding | Explicit | Insight | Zeppelin |
@@ -152,6 +166,7 @@ $ yo alfresco-docker-compose --acsVersion=6.2 --alfrescoVersion=community --http
 **Parameter names reference**
 
 `--acsVersion`: default 6.2, but could be set to 6.1
+`--ags:`: only available when acsVersion=6.1
 `--alfrescoVersion`: community or enterprise
 `--httpMode`: http or https
 `--clustering`: true or false
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/index.js b/e2e-test/generator-alfresco-docker-compose/generators/app/index.js
index d8c9d6007..5cd8f1fd9 100644
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/index.js
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/index.js
@@ -28,6 +28,13 @@ module.exports = class extends Generator {
         choices: [ "6.1", "6.2" ],
         default: '6.2'
       },
+      {
+        whenFunction: response => response.acsVersion == '6.1',
+        type: 'confirm',
+        name: 'ags',
+        message: 'Would you like to use AGS?',
+        default: false
+      },
       {
         type: 'list',
         name: 'alfrescoVersion',
@@ -122,9 +129,13 @@ module.exports = class extends Generator {
     }
 
     // Docker Compose environment variables values
-    this.fs.copy(
+    this.fs.copyTpl(
       this.templatePath(dockerComposeTemplateDirectory + '/.env'),
-      this.destinationPath('.env')
+      this.destinationPath('.env'),
+      {
+        acs: (this.props.ags ? "false" : "true"),
+        ags: (this.props.ags ? "true" : "false")
+      }
     )
 
     // Base Docker Compose Template
@@ -136,8 +147,26 @@ module.exports = class extends Generator {
     // Repository Docker Image name
     const acsImageName =
       (this.props.alfrescoVersion == 'community' ?
-        'alfresco/alfresco-content-repository-community' :
-        'alfresco/alfresco-content-repository');
+        (this.props.ags ? 
+          'alfresco/alfresco-governance-repository-community' :
+          'alfresco/alfresco-content-repository-community') :
+        (this.props.ags ? 
+          'quay.io/alfresco/alfresco-governance-repository-enterprise':
+          'alfresco/alfresco-content-repository'
+        )
+      );
+
+    // Share Docker Image name
+    const shareImageName =
+      (this.props.alfrescoVersion == 'community' ?
+        (this.props.ags ? 
+          'alfresco/alfresco-governance-share-community' :
+          'alfresco/alfresco-share') :
+        (this.props.ags ? 
+          'quay.io/alfresco/alfresco-governance-share-enterprise':
+          'alfresco/alfresco-share'
+        )
+      );
 
     // Search Docker Image
     const searchImageName =
@@ -164,7 +193,8 @@ module.exports = class extends Generator {
         searchPath: searchBasePath,
         zeppelin: (this.props.zeppelin ? "true" : "false"),
         sharding: (this.props.sharding ? "true" : "false"),
-        shardingMethod: (this.props.shardingMethod)
+        shardingMethod: (this.props.shardingMethod),
+        shareImage: shareImageName
       }
     );
 
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env
index c95352d50..969be3121 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/.env
@@ -1,6 +1,11 @@
+<% if (acs == 'true') { %>
 ALFRESCO_TAG=6.1.0.5
-ALFRESCO_CE_TAG=6.1.2-ga
-SHARE_TAG=6.1.0
+ALFRESCO_CE_TAG=6.1.2-ga 
+SHARE_TAG=6.1.0 <% } %>
+<% if (ags == 'true') { %>
+ALFRESCO_TAG=latest
+ALFRESCO_CE_TAG=latest
+SHARE_TAG=latest <% } %>
 POSTGRES_TAG=10.1
 TRANSFORM_ROUTER_TAG=1.0.1
 PDF_RENDERER_TAG=2.0.10
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
index 663ce09bf..e7342c754 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ce.yml
@@ -124,7 +124,7 @@ services:
     <% } %>
 
     share:
-        image: alfresco/alfresco-share:${SHARE_TAG}
+        image: <%=shareImage%>:${SHARE_TAG}
         mem_limit: 1g
         environment:
             REPO_HOST: "alfresco"
diff --git a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml
index 8c9d074f7..3ae6e144d 100755
--- a/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml
+++ b/e2e-test/generator-alfresco-docker-compose/generators/app/templates/6.1/docker-compose-ee.yml
@@ -264,7 +264,7 @@ services:
             - shared-file-store-volume:/tmp/Alfresco/sfs
 
     share:
-        image: alfresco/alfresco-share:${SHARE_TAG}
+        image: <%=shareImage%>:${SHARE_TAG}
         mem_limit: 1g
         environment:
             REPO_HOST: "alfresco"