diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6f666a18cb0..e15cfc964373 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,15 +12,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Added
 
-## [2.1.6] - 2020-07-01
+## [2.1.6] - 2020-07-08
 
 ### Changed
 
 - Updates for JEDI/ecbuild compatibility
   - Updates to CMake to use `NOINSTALL`
-  - Update `components.yaml` to use `NOINSTALL`
-    - ESMA_cmake v3.0.4
-    - ecbuild geos/v1.0.5
+  - Updates to `components.yaml` to support use of `NOINSTALL`
 
 ## [2.1.5] - 2020-06-11
 
diff --git a/components.yaml b/components.yaml
index 0b2a6c8ed57c..a50072d85f26 100644
--- a/components.yaml
+++ b/components.yaml
@@ -1,13 +1,13 @@
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v2.1.3
+  tag: v2.1.6
   develop: master
 
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.0.4
+  tag: v3.0.6
   develop: develop
 
 ecbuild: