diff --git a/bitnami/opencart/.gitignore b/bitnami/opencart/.gitignore
index 198748e37ba0..51b4cfda1133 100644
--- a/bitnami/opencart/.gitignore
+++ b/bitnami/opencart/.gitignore
@@ -1 +1 @@
-/local/
+local/
diff --git a/bitnami/opencart/2/.dockerignore b/bitnami/opencart/2/.dockerignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/bitnami/opencart/Dockerfile b/bitnami/opencart/2/Dockerfile
similarity index 97%
rename from bitnami/opencart/Dockerfile
rename to bitnami/opencart/2/Dockerfile
index 14a6087e29fb..9c61379cf831 100644
--- a/bitnami/opencart/Dockerfile
+++ b/bitnami/opencart/2/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>
 
diff --git a/bitnami/opencart/2/docker-compose.yml b/bitnami/opencart/2/docker-compose.yml
new file mode 100644
index 000000000000..17023ba5813b
--- /dev/null
+++ b/bitnami/opencart/2/docker-compose.yml
@@ -0,0 +1,28 @@
+version: '2'
+services:
+  mariadb:
+    image: 'bitnami/mariadb:latest'
+    volumes:
+      - 'mariadb_data:/bitnami/mariadb'
+  opencart:
+    image: 'bitnami/opencart:2'
+    ports:
+      - '80:80'
+      - '443:443'
+    volumes:
+      - 'opencart_data:/bitnami/opencart'
+      - 'apache_data:/bitnami/apache'
+      - 'php_data:/bitnami/php'
+    depends_on:
+      - mariadb
+    environment:
+      - OPENCART_HOST=localhost
+volumes:
+  mariadb_data:
+    driver: local
+  opencart_data:
+    driver: local
+  apache_data:
+    driver: local
+  php_data:
+    driver: local
diff --git a/bitnami/opencart/rootfs/apache-inputs.json b/bitnami/opencart/2/rootfs/apache-inputs.json
similarity index 100%
rename from bitnami/opencart/rootfs/apache-inputs.json
rename to bitnami/opencart/2/rootfs/apache-inputs.json
diff --git a/bitnami/opencart/rootfs/app-entrypoint.sh b/bitnami/opencart/2/rootfs/app-entrypoint.sh
similarity index 100%
rename from bitnami/opencart/rootfs/app-entrypoint.sh
rename to bitnami/opencart/2/rootfs/app-entrypoint.sh
diff --git a/bitnami/opencart/rootfs/opencart-inputs.json b/bitnami/opencart/2/rootfs/opencart-inputs.json
similarity index 100%
rename from bitnami/opencart/rootfs/opencart-inputs.json
rename to bitnami/opencart/2/rootfs/opencart-inputs.json
diff --git a/bitnami/opencart/circle.yml b/bitnami/opencart/circle.yml
index 8711d7f8ce4b..9cdc7cb381f7 100644
--- a/bitnami/opencart/circle.yml
+++ b/bitnami/opencart/circle.yml
@@ -2,6 +2,8 @@ machine:
   services:
   - docker
   environment:
+    RELEASE_SERIES_LIST: 2
+    LATEST_STABLE: 2
     IMAGE_NAME: opencart
     CHART_NAME: opencart
     CHART_REPO: https://github.com/kubernetes/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: