diff --git a/CHANGELOG.md b/CHANGELOG.md
index 152a9f06f..08cb6616b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.13.1 (2017-07-25)
+
+* gRPC timeout in the CLI raised from 1sec to 10sec (fix timeout with remote clusters)
+* A non verified user can be deleted
+* Docker Plugin can now be installed with options
+
 ## 0.13.0 (2017-07-25)
 
 * HA and self healing Cluster deployment on AWS
diff --git a/VERSION b/VERSION
index 53bf3a318..c317a9189 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.14.0-dev
+0.13.1
diff --git a/cli/command/cluster/bootstrap.go b/cli/command/cluster/bootstrap.go
index f6489f8dd..68e576703 100644
--- a/cli/command/cluster/bootstrap.go
+++ b/cli/command/cluster/bootstrap.go
@@ -10,7 +10,7 @@ import (
 
 const (
 	bootstrapImg = "appcelerator/amp-bootstrap:%s"
-	bootstrapTag = "0.13.0"
+	bootstrapTag = "0.13.1"
 )
 
 var (
diff --git a/cluster/agent/stacks/02-ampbeat.amp.yml b/cluster/agent/stacks/02-ampbeat.amp.yml
index 9bb76b664..155a591df 100644
--- a/cluster/agent/stacks/02-ampbeat.amp.yml
+++ b/cluster/agent/stacks/02-ampbeat.amp.yml
@@ -8,7 +8,7 @@ networks:
 services:
 
   ampbeat:
-    image: appcelerator/ampbeat:${TAG:-0.13.0}
+    image: appcelerator/ampbeat:${TAG:-0.13.1}
     networks:
       - default
     deploy:
diff --git a/cluster/agent/stacks/05-prometheus.amp.yml b/cluster/agent/stacks/05-prometheus.amp.yml
index f554dd273..27974575d 100644
--- a/cluster/agent/stacks/05-prometheus.amp.yml
+++ b/cluster/agent/stacks/05-prometheus.amp.yml
@@ -15,7 +15,7 @@ configs:
 services:
 
   prometheus:
-    image: appcelerator/amp-prometheus:${TAG:-0.13.0}
+    image: appcelerator/amp-prometheus:${TAG:-0.13.1}
     networks:
       - default
     volumes:
diff --git a/cluster/agent/stacks/09-amplifier.amp.yml b/cluster/agent/stacks/09-amplifier.amp.yml
index c847cef00..1a82da9df 100644
--- a/cluster/agent/stacks/09-amplifier.amp.yml
+++ b/cluster/agent/stacks/09-amplifier.amp.yml
@@ -14,7 +14,7 @@ secrets:
 services:
 
   amplifier:
-    image: appcelerator/amplifier:${TAG:-0.13.0}
+    image: appcelerator/amplifier:${TAG:-0.13.1}
     networks:
       - default
     environment:
diff --git a/cluster/agent/stacks/10-gateway.amp.yml b/cluster/agent/stacks/10-gateway.amp.yml
index ada6fbc09..085732964 100644
--- a/cluster/agent/stacks/10-gateway.amp.yml
+++ b/cluster/agent/stacks/10-gateway.amp.yml
@@ -8,7 +8,7 @@ networks:
 services:
 
   gateway:
-    image: appcelerator/gateway:${TAG:-0.13.0}
+    image: appcelerator/gateway:${TAG:-0.13.1}
     networks:
       - default
     labels:
diff --git a/cluster/agent/stacks/11-agent.amp.yml b/cluster/agent/stacks/11-agent.amp.yml
index 3f9b8a80a..e3032745f 100644
--- a/cluster/agent/stacks/11-agent.amp.yml
+++ b/cluster/agent/stacks/11-agent.amp.yml
@@ -11,7 +11,7 @@ volumes:
 services:
 
   agent:
-    image: appcelerator/agent:${TAG:-0.13.0}
+    image: appcelerator/agent:${TAG:-0.13.1}
     networks:
       - default
     deploy:
diff --git a/cluster/plugin/aws/plugin.go b/cluster/plugin/aws/plugin.go
index 42a3af480..0dba634c9 100644
--- a/cluster/plugin/aws/plugin.go
+++ b/cluster/plugin/aws/plugin.go
@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	DefaultTemplateURL = "https://s3.amazonaws.com/io-amp-binaries/templates/v0.13.0/aws-swarm-asg.yml"
+	DefaultTemplateURL = "https://s3.amazonaws.com/io-amp-binaries/templates/v0.13.1/aws-swarm-asg.yml"
 )
 
 // RequestOptions stores raw request input options before transformation into a AWS SDK specific
diff --git a/examples/clusters/aws-swarm-asg.yml b/examples/clusters/aws-swarm-asg.yml
index 49d7a83c0..065dd22f1 100644
--- a/examples/clusters/aws-swarm-asg.yml
+++ b/examples/clusters/aws-swarm-asg.yml
@@ -1,5 +1,5 @@
 AWSTemplateFormatVersion: '2010-09-09'
-Description: Swarm cluster with autoscaling groups v0.14.0-dev
+Description: Swarm cluster with autoscaling groups v0.13.1
 
 Mappings:
   AMI:
@@ -236,7 +236,7 @@ Parameters:
   ApplicationVersion:
     Type: String
     Description: Use the latest release version for the best result (a tag, e.g. 0.13.1)
-    Default: latest
+    Default: 0.13.1
   MirrorRegistry:
     Type: String
     Description: If yes, a mirror registry will be installed
diff --git a/platform/stacks/amp.stack.yml b/platform/stacks/amp.stack.yml
index 9e6d94aa7..4b015d1a6 100644
--- a/platform/stacks/amp.stack.yml
+++ b/platform/stacks/amp.stack.yml
@@ -17,7 +17,7 @@ secrets:
 services:
 
   amplifier:
-    image: appcelerator/amplifier:${TAG:-0.13.0}
+    image: appcelerator/amplifier:${TAG:-0.13.1}
     networks:
       - default
     environment:
@@ -47,7 +47,7 @@ services:
         mode: 0400
 
   gateway:
-    image: appcelerator/gateway:${TAG:-0.13.0}
+    image: appcelerator/gateway:${TAG:-0.13.1}
     networks:
       - default
     labels:
@@ -66,7 +66,7 @@ services:
         - node.labels.amp.type.core == true
 
   agent:
-    image: appcelerator/agent:${TAG:-0.13.0}
+    image: appcelerator/agent:${TAG:-0.13.1}
     networks:
       - default
     deploy:
diff --git a/platform/stacks/ampmon.2.stack.yml b/platform/stacks/ampmon.2.stack.yml
index 5bc69d0f8..15d3a7f7e 100644
--- a/platform/stacks/ampmon.2.stack.yml
+++ b/platform/stacks/ampmon.2.stack.yml
@@ -8,7 +8,7 @@ networks:
 services:
 
   ampbeat:
-    image: appcelerator/ampbeat:${TAG:-0.13.0}
+    image: appcelerator/ampbeat:${TAG:-0.13.1}
     networks:
       - default
     deploy:
diff --git a/platform/stacks/ampmon.3.stack.yml b/platform/stacks/ampmon.3.stack.yml
index 083921a5a..52609d565 100644
--- a/platform/stacks/ampmon.3.stack.yml
+++ b/platform/stacks/ampmon.3.stack.yml
@@ -47,7 +47,7 @@ services:
              "-web.external-url=http://localhost:9093" ]
 
   prometheus:
-    image: appcelerator/amp-prometheus:${TAG:-0.13.0}
+    image: appcelerator/amp-prometheus:${TAG:-0.13.1}
     networks:
       - default
     volumes: