diff --git a/bitnami/codeigniter/.gitignore b/bitnami/codeigniter/.gitignore
index 198748e37ba0..51b4cfda1133 100644
--- a/bitnami/codeigniter/.gitignore
+++ b/bitnami/codeigniter/.gitignore
@@ -1 +1 @@
-/local/
+local/
diff --git a/bitnami/codeigniter/3/.dockerignore b/bitnami/codeigniter/3/.dockerignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/bitnami/codeigniter/Dockerfile b/bitnami/codeigniter/3/Dockerfile
similarity index 100%
rename from bitnami/codeigniter/Dockerfile
rename to bitnami/codeigniter/3/Dockerfile
diff --git a/bitnami/codeigniter/3/docker-compose.yml b/bitnami/codeigniter/3/docker-compose.yml
new file mode 100644
index 000000000000..35558244d5df
--- /dev/null
+++ b/bitnami/codeigniter/3/docker-compose.yml
@@ -0,0 +1,10 @@
+version: '2'
+services:
+  myapp:
+    image: bitnami/codeigniter:3
+    environment:
+      - CODEIGNITER_PROJECT_NAME=
+    ports:
+      - '8000:8000'
+    volumes:
+      - '.:/app'
diff --git a/bitnami/codeigniter/rootfs/app-entrypoint.sh b/bitnami/codeigniter/3/rootfs/app-entrypoint.sh
similarity index 100%
rename from bitnami/codeigniter/rootfs/app-entrypoint.sh
rename to bitnami/codeigniter/3/rootfs/app-entrypoint.sh
diff --git a/bitnami/codeigniter/circle.yml b/bitnami/codeigniter/circle.yml
index e0612ad846ed..09f3d2003e62 100644
--- a/bitnami/codeigniter/circle.yml
+++ b/bitnami/codeigniter/circle.yml
@@ -2,6 +2,8 @@ machine:
   services:
   - docker
   environment:
+    RELEASE_SERIES_LIST: 3
+    LATEST_STABLE: 3
     IMAGE_NAME: codeigniter
     CHART_NAME: codeigniter
     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: