diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1c4e1144e..16de3f543 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,27 @@
 # Changelog
 
+## 0.18.0 (2018-04-05)
+
+* fixes in pkg/docker package to allow connection with TLS options. Necessary for amplifier and prometheus connection to a secured Swarm manager
+* Fix AMP-102 (enable TLS on manager nodes), see details in https://techweb.axway.com/confluence/display/AMP/Cluster+with+secured+Docker+API
+* Fix AMP-132 (AMI updated to Docker CE 17.12.1)
+* Internal PKI for Docker daemon certificates
+* all manager nodes expose the engine API with TLS enabled
+* all nodes get a unique client certificate give access to the manager nodes API
+* Fix AMP-133 (enable enhanced networking)
+* Fix AMP-99 (enable gen5 instance types: m5 and c5)
+* templating for core stack files, see details in https://techweb.axway.com/confluence/display/AMP/Cluster+with+secured+Docker+API
+* add useful information in the output of docker cluster output
+* minor fixes in existing dashboards
+* new dashboard for monitoring coverage: it displays the percentage of cadvisor tasks on swarm nodes (should be 100% on healthy clusters)
+* Fix AMP-141 (amp overlay network can't default to /24)
+* Detection of cloud provider based on /sys/hypervision/uuid may fail (it's maybe related to ENA). In this case, falling back to /sys/devices/virtual/dmi/id/product_uuid provides the information
+* new command: amp cluster node cleanup, Removes any node in the Down status
+* Deployment on AWS can include a mirror registry, only available from inside the VPC. This adds an image command to the CLI, allowing to list, push or remove images from the mirror registry with the AMP authorization model
+* Replacement of classic ELB with network LB for the manager nodes (internal and external).
+* NLB bring a few advantages: less expensive, low latency, high throughput, static IPs, zonal isolation
+* bump dependencies: elasticsearch 6.2.1, nats v0.9.2, prometheus 2.2.1, grafana 5.0.4, etcd 3.2.18
+
 ## 0.17.0 (2017-11-29)
 
 * Public REST API documentation
diff --git a/VERSION b/VERSION
index 498b6fb3d..66333910a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.18.0-dev
+0.18.0
diff --git a/cluster/ampagent/stacks/01-core.yml.tpl b/cluster/ampagent/stacks/01-core.yml.tpl
index 411c19771..36683fffc 100644
--- a/cluster/ampagent/stacks/01-core.yml.tpl
+++ b/cluster/ampagent/stacks/01-core.yml.tpl
@@ -65,7 +65,7 @@ services:
 {{- end }}
 
   amplifier:
-    image: appcelerator/amplifier:${TAG:-latest}
+    image: appcelerator/amplifier:${TAG:-0.18.0}
     networks:
       - core
       - monit
@@ -113,7 +113,7 @@ services:
         mode: 0400
 
   gateway:
-    image: appcelerator/gateway:${TAG:-latest}
+    image: appcelerator/gateway:${TAG:-0.18.0}
     networks:
       - core
       - public
diff --git a/cluster/ampagent/stacks/02-logs.yml.tpl b/cluster/ampagent/stacks/02-logs.yml.tpl
index 66c645002..2841190bf 100644
--- a/cluster/ampagent/stacks/02-logs.yml.tpl
+++ b/cluster/ampagent/stacks/02-logs.yml.tpl
@@ -84,7 +84,7 @@ services:
 {{- end }}
 
   ampbeat:
-    image: appcelerator/ampbeat:${TAG:-latest}
+    image: appcelerator/ampbeat:${TAG:-0.18.0}
     networks:
       - core
     deploy:
@@ -133,7 +133,7 @@ services:
       VIRTUAL_HOST: "http://kibana.*,https://kibana.*"
 
   agent:
-    image: appcelerator/agent:${TAG:-latest}
+    image: appcelerator/agent:${TAG:-0.18.0}
     networks:
       - core
     deploy:
diff --git a/cluster/ampagent/stacks/03-metrics.yml.tpl b/cluster/ampagent/stacks/03-metrics.yml.tpl
index 549c46fc5..896c420fc 100644
--- a/cluster/ampagent/stacks/03-metrics.yml.tpl
+++ b/cluster/ampagent/stacks/03-metrics.yml.tpl
@@ -24,7 +24,7 @@ secrets:
 services:
 
   prometheus:
-    image: appcelerator/amp-prometheus:${TAG:-latest}
+    image: appcelerator/amp-prometheus:${TAG:-0.18.0}
     networks:
       - public
       - monit
diff --git a/cluster/plugin/aws/plugin/plugin.go b/cluster/plugin/aws/plugin/plugin.go
index fe7e6adb1..7cdc7fe6c 100644
--- a/cluster/plugin/aws/plugin/plugin.go
+++ b/cluster/plugin/aws/plugin/plugin.go
@@ -16,7 +16,7 @@ import (
 
 const (
 	// replace latest by the version when releasing the plugin
-	DefaultTemplateURL = "https://s3.amazonaws.com/io-amp-binaries/templates/latest/aws-swarm-asg.yml"
+	DefaultTemplateURL = "https://s3.amazonaws.com/io-amp-binaries/templates/v0.18.0/aws-swarm-asg.yml"
 )
 
 // Configuration stores raw request input options before transformation into a AWS SDK specific structs  used by the cloudformation api.
diff --git a/examples/clusters/aws-swarm-asg.yml b/examples/clusters/aws-swarm-asg.yml
index 8896e99bf..7a9753aa1 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.18.0-dev
+Description: Swarm cluster with autoscaling groups v0.18.0
 
 Mappings:
   AMI:
@@ -254,7 +254,7 @@ Parameters:
   ApplicationVersion:
     Type: String
     Description: Use the latest release version for the best result (a tag, e.g. 0.17.0)
-    Default: latest
+    Default: 0.18.0
   ApplicationOptions:
     Type: String
     Description: Extra parameters passed to the ampagent for core services deployment