diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6056cf607a3cfb9fb4a5d32e90e31730bedddaa..2fad5615469b7e135af7461b08fb0cc9a07fa840 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,11 @@ All notable changes to this project are documented below.
 The format is based on [keep a changelog](http://keepachangelog.com) and this project uses [semantic versioning](http://semver.org).
 
 ## [Unreleased]
+### Changed
+- Do not use absolute path for `tini` executable in default container entrypoint.
 
+### Fixed
+- Correctly read pagination cursor in notification listings.
 
 ## [2.8.0] - 2019-11-11
 ### Added
diff --git a/build/Dockerfile b/build/Dockerfile
index 2f72ce47025efd51b42268c7e3853b1a90169f12..dc038897846e1d8090c1df075d85f2ac3d8ef391 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -55,7 +55,7 @@ WORKDIR /nakama/
 COPY --from=builder "/go/build-out/nakama" /nakama/
 EXPOSE 7349 7350 7351
 
-ENTRYPOINT ["/usr/bin/tini", "--", "/nakama/nakama"]
+ENTRYPOINT ["tini", "--", "/nakama/nakama"]
 
 HEALTHCHECK --interval=5m --timeout=10s \
   CMD curl -f http://localhost:7350/ || exit 1