diff --git a/CHANGELOG.md b/CHANGELOG.md
index c476bf0..33e4fef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### citus-docker v6.1.1 (May 16, 2017) ###
+
+* Bump Citus version to 6.1.0
+
+* Based on latest PostgreSQL 9.6.3 image and official Citus 6.1.1 package
+
 ### citus-docker v6.1.0 (February 10, 2017) ###
 
 * Bump Citus version to 6.1.0
diff --git a/Dockerfile b/Dockerfile
index e79b170..9a52a34 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM postgres:9.6.2
+FROM postgres:9.6.3
 MAINTAINER Citus Data https://citusdata.com
 
-ENV CITUS_VERSION 6.1.0.citus-1
+ENV CITUS_VERSION 6.1.1.citus-1
 
 # install Citus
 RUN apt-get update \
diff --git a/docker-compose.yml b/docker-compose.yml
index bb119b7..b07d79d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,12 +3,12 @@ version: '2'
 services:
   master:
     container_name: 'citus_master'
-    image: 'citusdata/citus:6.1.0'
+    image: 'citusdata/citus:6.1.1'
     ports: ['5432:5432']
     labels: ['com.citusdata.role=Master']
     volumes: ['/var/run/postgresql']
   worker:
-    image: 'citusdata/citus:6.1.0'
+    image: 'citusdata/citus:6.1.1'
     labels: ['com.citusdata.role=Worker']
   config:
     container_name: 'citus_config'