diff --git a/bitnami/rabbitmq/.gitignore b/bitnami/rabbitmq/.gitignore
index 198748e37ba0..51b4cfda1133 100644
--- a/bitnami/rabbitmq/.gitignore
+++ b/bitnami/rabbitmq/.gitignore
@@ -1 +1 @@
-/local/
+local/
diff --git a/bitnami/rabbitmq/3/.dockerignore b/bitnami/rabbitmq/3/.dockerignore
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/bitnami/rabbitmq/Dockerfile b/bitnami/rabbitmq/3/Dockerfile
similarity index 100%
rename from bitnami/rabbitmq/Dockerfile
rename to bitnami/rabbitmq/3/Dockerfile
diff --git a/bitnami/rabbitmq/3/docker-compose.yml b/bitnami/rabbitmq/3/docker-compose.yml
new file mode 100644
index 000000000000..c593fbc6e7aa
--- /dev/null
+++ b/bitnami/rabbitmq/3/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '2'
+services:
+  rabbitmq:
+    image: 'bitnami/rabbitmq:3'
+    ports:
+      - '4369:4369'
+      - '5672:5672'
+      - '25672:25672'
+      - '15672:15672'
+    volumes:
+      - 'rabbitmq_data:/bitnami/rabbitmq'
+volumes:
+  rabbitmq_data:
+    driver: local
diff --git a/bitnami/rabbitmq/rootfs/app-entrypoint.sh b/bitnami/rabbitmq/3/rootfs/app-entrypoint.sh
similarity index 100%
rename from bitnami/rabbitmq/rootfs/app-entrypoint.sh
rename to bitnami/rabbitmq/3/rootfs/app-entrypoint.sh
diff --git a/bitnami/rabbitmq/rootfs/rabbitmq-inputs.json b/bitnami/rabbitmq/3/rootfs/rabbitmq-inputs.json
similarity index 100%
rename from bitnami/rabbitmq/rootfs/rabbitmq-inputs.json
rename to bitnami/rabbitmq/3/rootfs/rabbitmq-inputs.json
diff --git a/bitnami/rabbitmq/circle.yml b/bitnami/rabbitmq/circle.yml
index 7668f8a14a16..a80b78d6886b 100644
--- a/bitnami/rabbitmq/circle.yml
+++ b/bitnami/rabbitmq/circle.yml
@@ -2,6 +2,8 @@ machine:
   services:
   - docker
   environment:
+    RELEASE_SERIES_LIST: 3
+    LATEST_STABLE: 3
     IMAGE_NAME: rabbitmq
     CHART_NAME: rabbitmq
     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: