diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33e4fef..241ca73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
+### citus-docker v6.2.1 (May 24, 2017) ###
+
+* Bump Citus version to 6.2.1
+
 ### citus-docker v6.1.1 (May 16, 2017) ###
 
-* Bump Citus version to 6.1.0
+* Bump Citus version to 6.1.1
 
 * Based on latest PostgreSQL 9.6.3 image and official Citus 6.1.1 package
 
diff --git a/Dockerfile b/Dockerfile
index 9a52a34..c324587 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM postgres:9.6.3
 MAINTAINER Citus Data https://citusdata.com
 
-ENV CITUS_VERSION 6.1.1.citus-1
+ENV CITUS_VERSION 6.2.1.citus-1
 
 # install Citus
 RUN apt-get update \
@@ -9,7 +9,7 @@ RUN apt-get update \
        ca-certificates \
        curl \
     && curl -s https://install.citusdata.com/community/deb.sh | bash \
-    && apt-get install -y postgresql-$PG_MAJOR-citus-6.1=$CITUS_VERSION \
+    && apt-get install -y postgresql-$PG_MAJOR-citus-6.2=$CITUS_VERSION \
     && apt-get purge -y --auto-remove curl \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/docker-compose.yml b/docker-compose.yml
index b07d79d..4557d18 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.1'
+    image: 'citusdata/citus:6.2.1'
     ports: ['5432:5432']
     labels: ['com.citusdata.role=Master']
     volumes: ['/var/run/postgresql']
   worker:
-    image: 'citusdata/citus:6.1.1'
+    image: 'citusdata/citus:6.2.1'
     labels: ['com.citusdata.role=Worker']
   config:
     container_name: 'citus_config'