diff --git a/CHANGELOG.md b/CHANGELOG.md
index e44c262fdab031c1587737c21a39a60e081d14cb..66fa83ea1d180e396e751439635e63fac3357785 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,14 +7,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+### Changed
+### Removed
+### Fixed
+
+## [1.2] - 2018-08-27
+
+### Added
+
+- Added aa-statistics script to help aggregate statistics about IdP/SP Interoperability for LINDAT (see https://trac.clarin.eu/wiki/ServiceProviderFederation/LoginTest)
+- Added the shib testing page as required by CLARIN (#10)
+- Adapted item view to also show dc.relation.isbasedon if it is available (in [clarin-dspace repository](https://github.com/commul/clarin-dspace/commit/5f8f50457b48d966c169cd29268e7529dee4622f))
+
 ### Changed
 
-- Made DSpace user configurable through environment variable
+- Made DSpace user configurable through environment variable (#45)
+- Docker Image naming convention has been changed
+- Upgraded tomcat to version 8.0.52
+- Changed links to licenses to https (in [clarin-dspace repository](https://github.com/commul/clarin-dspace/commit/b41edf205520afe373e602940a2263b394c858ab))
 
 ### Removed
 
 - Removed link to Anonymous Privacy Policy from Shibboleth Metadata
 
+### Fixed
+
+- Shibboleth build script now uses fixed version numbers instead of latest
+- Super short session timeout will no longer happen (#44)
+
 ## [1.1] - 2018-06-15
 
 ### Added
@@ -38,3 +59,4 @@ This is the first release. It all starts here.
 
 [Unreleased]:https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.1...HEAD
 [1.1]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.0...v1.1
+[1.2]: https://gitlab.inf.unibz.it/commul/docker/clarin-dspace/compare/v1.1...v1.2
diff --git a/kubernetes/dspace-deployment.yaml b/kubernetes/dspace-deployment.yaml
index 0e371508777b4593101fc39bcff0d5f864da45f0..aa92bcc754f1d8806b826ee898a7c5cceaf9a33b 100644
--- a/kubernetes/dspace-deployment.yaml
+++ b/kubernetes/dspace-deployment.yaml
@@ -50,7 +50,7 @@ spec:
             secretKeyRef:
               key: mail.pass
               name: dspace-secrets
-        image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/dspace:1.1.8l
+        image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/dspace:1.2
         name: clarin-dspace
         imagePullPolicy: Always
         ports:
diff --git a/kubernetes/nginx-deployment.yaml b/kubernetes/nginx-deployment.yaml
index 342bed785c11accd8cbbf3a0a0633147ce301383..ed7c50741c8981b77f9eb8439b3eb7c11e00beab 100644
--- a/kubernetes/nginx-deployment.yaml
+++ b/kubernetes/nginx-deployment.yaml
@@ -20,7 +20,7 @@ spec:
         io.kompose.service: nginx
     spec:
       containers:
-      - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/nginx:1.1.8l
+      - image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/nginx:1.2
         imagePullPolicy: Always
         name: clarin-nginx
         ports:
diff --git a/kubernetes/postgres-deployment.yaml b/kubernetes/postgres-deployment.yaml
index 3477c2f713960295fcd8233c4fb2afccac55546c..ba880bf880170d8395f427cb86ef1a4d6f71352e 100644
--- a/kubernetes/postgres-deployment.yaml
+++ b/kubernetes/postgres-deployment.yaml
@@ -48,7 +48,7 @@ spec:
             secretKeyRef:
               key: dspace.utils.name
               name: dspace-secrets
-        image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/postgres:1.1.8l
+        image: gitlab.inf.unibz.it:4567/commul/docker/clarin-dspace/staging/postgres:1.2
         imagePullPolicy: Always
         name: clarin-postgres
         resources: {}