diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2aaffe6..1a5393f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.8.4
+
+* Fix admin contexts resources ordering ([alvagante](https://github.com/alvagante))
+* Update default package versions
+
 ### 1.8.3
 
 * Add configuration of
diff --git a/README.md b/README.md
index 531e10f..bf3c8ab 100644
--- a/README.md
+++ b/README.md
@@ -909,6 +909,7 @@ Check the [puppetlabs_spec_helper](https://github.com/puppetlabs/puppetlabs_spec
 * [Martin Zehetmayer](https://github.com/angrox)
 * [Rurik Ylä-Onnenvuori](https://github.com/ruriky)
 * [Hal Deadman](https://github.com/hdeadman)
-* [HerveMARTIN](https://github.com/HerveMARTIN)
+* [Hervé Martin](https://github.com/HerveMARTIN)
+* [Alessandro Franceschi](https://github.com/alvagante)
 
 Features request and contributions are always welcome!
diff --git a/manifests/params.pp b/manifests/params.pp
index 980a522..86f9612 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -24,9 +24,9 @@
         }
         'Amazon' : {
           # https://alas.aws.amazon.com
-          $version = '8.0.46'           # ALAS-2017-903
+          $version = '8.5.23'           # ALAS-2017-913
           $package_name = 'tomcat8'
-          # $version = '7.0.81'         # ALAS-2017-903
+          # $version = '7.0.82'         # ALAS-2017-913
           # $package_name = 'tomcat7'
           # $version = '6.0.53'         # ALAS-2017-821
           # $package_name = 'tomcat6'
@@ -212,7 +212,6 @@
               $package_name = 'tomcat8'
             }
             # yakkety
-            # https://packages.ubuntu.com/yakkety-updates/tomcat8
             '16.10' : {
               $version = '8.0.37-1ubuntu0.1'
               $package_name = 'tomcat8'
diff --git a/metadata.json b/metadata.json
index 5d0d153..970e68f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -2,7 +2,7 @@
   "name": "aco-tomcat",
   "summary": "Puppet module for Tomcat",
   "author": "Antoine Cotten",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "license": "Apache-2.0",
   "project_page": "https://github.com/antoineco/aco-tomcat",
   "source": "git://github.com/antoineco/aco-tomcat.git",