diff --git a/bitnami/postgresql/.gitignore b/bitnami/postgresql/.gitignore
index e3990ef5f67b..51b4cfda1133 100644
--- a/bitnami/postgresql/.gitignore
+++ b/bitnami/postgresql/.gitignore
@@ -1,2 +1 @@
-/local/
-pkg-cache/
+local/
diff --git a/bitnami/postgresql/.dockerignore b/bitnami/postgresql/9.6/.dockerignore
similarity index 100%
rename from bitnami/postgresql/.dockerignore
rename to bitnami/postgresql/9.6/.dockerignore
diff --git a/bitnami/postgresql/Dockerfile b/bitnami/postgresql/9.6/Dockerfile
similarity index 94%
rename from bitnami/postgresql/Dockerfile
rename to bitnami/postgresql/9.6/Dockerfile
index 5e5651a9355a..8cec0d8c83ae 100644
--- a/bitnami/postgresql/Dockerfile
+++ b/bitnami/postgresql/9.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/stacksmith-images/minideb:jessie-r9
+FROM gcr.io/stacksmith-images/minideb:jessie-r10
 MAINTAINER Bitnami <containers@bitnami.com>
 
 ENV BITNAMI_IMAGE_VERSION=9.6.2-r0 \
diff --git a/bitnami/postgresql/9.6/docker-compose.yml b/bitnami/postgresql/9.6/docker-compose.yml
new file mode 100644
index 000000000000..0649eea927ec
--- /dev/null
+++ b/bitnami/postgresql/9.6/docker-compose.yml
@@ -0,0 +1,13 @@
+version: '2'
+
+services:
+  postgresql:
+    image: 'bitnami/postgresql:9.6'
+    ports:
+      - '5432:5432'
+    volumes:
+      - 'postgresql_data:/bitnami/postgresql'
+
+volumes:
+  postgresql_data:
+    driver: local
diff --git a/bitnami/postgresql/rootfs/app-entrypoint.sh b/bitnami/postgresql/9.6/rootfs/app-entrypoint.sh
similarity index 100%
rename from bitnami/postgresql/rootfs/app-entrypoint.sh
rename to bitnami/postgresql/9.6/rootfs/app-entrypoint.sh
diff --git a/bitnami/postgresql/rootfs/postgresql-inputs.json b/bitnami/postgresql/9.6/rootfs/postgresql-inputs.json
similarity index 100%
rename from bitnami/postgresql/rootfs/postgresql-inputs.json
rename to bitnami/postgresql/9.6/rootfs/postgresql-inputs.json
diff --git a/bitnami/postgresql/circle.yml b/bitnami/postgresql/circle.yml
index 870f213dbf64..9f575cd32d8f 100644
--- a/bitnami/postgresql/circle.yml
+++ b/bitnami/postgresql/circle.yml
@@ -2,6 +2,8 @@ machine:
   services:
   - docker
   environment:
+    RELEASE_SERIES_LIST: 9.6
+    LATEST_STABLE: 9.6
     IMAGE_NAME: postgresql
     CHART_NAME: postgresql
     CHART_REPO: https://github.com/bitnami/charts
@@ -12,11 +14,11 @@ dependencies:
   override:
   - docker info
   - gcloud version
-  - docker pull $DOCKER_PROJECT/$IMAGE_NAME:_ || true
+  - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-pull-cache.sh | bash -
 
 test:
   override:
-  - docker build --rm=false -t $DOCKER_PROJECT/$IMAGE_NAME:$CIRCLE_BUILD_NUM .
+  - curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/docker-image-test.sh | bash -
 
 deployment:
   cache: