diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..4d1741cca
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,39 @@
+version: 2
+jobs:
+  package:
+    working_directory: /workdir
+    docker:
+      - image: docker:17.06.0-ce-git
+        environment:
+
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 17.06.0-ce
+      - run:
+          name: Upgrade system packages (workaround - https://github.com/docker-library/docker/issues/72)
+          command: |
+            apk upgrade --no-cache
+      - run:
+          name: Install dependencies
+          command: |
+            apk add --no-cache bash curl
+      - run:
+          name: Package charts
+          command: |
+            curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/helm-package-charts.sh | bash -
+      - deploy:
+          name: Publish charts
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              curl -sL https://raw.githubusercontent.com/bitnami/test-infra/master/circle/helm-publish-charts.sh | bash -
+            fi
+
+workflows:
+  version: 2
+  package-and-deploy:
+    jobs:
+      - package:
+          filters:
+            branches:
+              only: /.*/