diff --git a/phabricator/Chart.yaml b/phabricator/Chart.yaml
new file mode 100644
index 000000000..7571f2726
--- /dev/null
+++ b/phabricator/Chart.yaml
@@ -0,0 +1,13 @@
+name: phabricator
+home: https://www.phacility.com
+source:
+- https://github.com/bitnami/bitnami-docker-phabricator
+version: 0.2.1
+description: Collection of open source web applications that help software companies build better software.
+maintainers:
+- Bitnami <containers@bitnami.com>
+dependencies:
+- name: mariadb
+  version: 0.2.1
+details: |-
+  Phabricator is a collection of open source web applications that help software companies build better software.
diff --git a/phabricator/README.md b/phabricator/README.md
new file mode 100644
index 000000000..554881b75
--- /dev/null
+++ b/phabricator/README.md
@@ -0,0 +1,99 @@
+# Phabricator
+
+> Phabricator is a collection of open source web applications that help software companies build better software. Phabricator is built by developers for developers. Every feature is optimized around developer efficiency for however you like to work. Code Quality starts with effective collaboration between team members.
+
+Based on the [Bitnami Phabricator](https://github.com/bitnami/bitnami-docker-phabricator) image for docker, this Chart bootstraps a [Phabricator](https://phabricator.org/) deployment on a [Kubernetes](https://kubernetes.io) cluster using [Helm](https://helm.sh).
+
+## Dependencies
+
+The Phabricator Chart requires the [Bitnami MariaDB Chart](https://github.com/bitnami/charts/tree/master/mariadb) for setting up a database backend.
+
+Please refer to the [README](https://github.com/bitnami/charts/tree/master/mariadb) of the Bitnami MariaDB Chart for deployment instructions.
+
+## Persistence
+
+> *You may skip this section if your only interested in testing the Phabricator Chart and have not yet made the decision to use it for your production workloads.*
+
+For persistence of the Phabricator configuration and user file uploads, mount a [storage volume](http://kubernetes.io/v1.0/docs/user-guide/volumes.html) at the `/bitnami/phabricator` path of the Phabricator pod.
+
+By default the Phabricator Chart mounts an [emptyDir](http://kubernetes.io/docs/user-guide/volumes/#emptydir) volume.
+
+## Configuration
+
+To edit the default Phabricator configuration, run
+
+```bash
+$ helmc edit phabricator
+```
+
+Here you can update the Phabricator admin username, password and email address in `tpl/values.toml`. When not specified, the default values are used.
+
+Refer to the [Environment variables](https://github.com/bitnami/bitnami-docker-phabricator/#environment-variables) section of the [Bitnami Phabricator](https://github.com/bitnami/bitnami-docker-phabricator) image for the default values.
+
+The values of `phabricatorUser` and `phabricatorPassword` are the login credentials when you [access the Phabricator instance](#access-your-phabricator-application).
+
+Finally, generate the chart to apply your changes to the configuration.
+
+```bash
+$ helmc generate --force phabricator
+```
+
+## Access your Phabricator application
+
+> Note:
+>
+> Phabricator service needs to know the Load Balancer IP to be configured properly. That's why you need to create a public address before you install the Phabricator Helm Chart.
+>
+> On GKE, you can can reserve a static external address and then specify that as the loadBalancerIP of a service. More information at [https://cloud.google.com/compute/docs/configure-instance-ip-addresses]
+>
+> On other cloud platforms you may have to setup a firewall rule manually. Please refer your cloud providers documentation.
+
+Reserve a static external address using:
+
+```bash
+$ gcloud compute addresses create phabricator-public-ip
+Created [https://www.googleapis.com/compute/v1/...].
+---
+address: 104.197.39.194
+creationTimestamp: '2016-08-12T03:02:30.702-07:00'
+description: ''
+id: '8563442497282383961'
+kind: compute#address
+name: phabricator-public-ip
+region: ...
+status: RESERVED
+```
+
+Edit `values.toml` and update `phabricatorHostIP` with the public IP you reserved before (104.197.39.194 in this example), regenerate the chart and install.
+
+```bash
+$ helmc generate --force phabricator
+$ helmc install phabricator
+```
+
+> Note:
+>
+> If you want to use a FQDN associated the IP reserved for the Load Balancer. You need to configure Phabricator service properly.
+
+
+Edit values.toml and update phabricatorHost with the FQDN associated to the reserved IP, regenerate the chart and install.
+```bash
+$ helmc generate --force phabricator
+$ helmc install phabricator
+```
+
+You should now be able to access the application using the external IP reserved for the Phabricator service (or the FQDN if configured).
+The default credentials are:
+
+ - Username: `user`
+ - Password: `bitnami1`
+
+## Cleanup
+
+To delete the Phabricator deployment completely:
+
+```bash
+$ helmc uninstall -n default phabricator
+```
+
+Additionally you may want to [Cleanup the MariaDB Chart](https://github.com/bitnami/charts/tree/master/mariadb#cleanup)
diff --git a/phabricator/manifests/phabricator-rc.yaml b/phabricator/manifests/phabricator-rc.yaml
new file mode 100644
index 000000000..e572bbd3d
--- /dev/null
+++ b/phabricator/manifests/phabricator-rc.yaml
@@ -0,0 +1,99 @@
+#helm:generate helmc tpl -d tpl/values.toml -o manifests/phabricator-rc.yaml $HELM_GENERATE_FILE
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: phabricator
+  labels:
+    app: phabricator
+    provider: phabricator-server
+    heritage: bitnami
+spec:
+  replicas: 1
+  selector:
+    app: phabricator
+    provider: phabricator-server
+    version: 2016.31-r0
+  template:
+    metadata:
+      labels:
+        app: phabricator
+        provider: phabricator-server
+        version: 2016.31-r0
+        heritage: bitnami
+    spec:
+      containers:
+      - name: phabricator
+        image: bitnami/phabricator:2016.31-r0
+        env:
+        - name: MARIADB_HOST
+          value: "mariadb"
+        - name: MARIADB_PORT
+          value: "3306"
+        - name: MARIADB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: mariadb
+              key: mariadb-root-password
+        - name: PHABRICATOR_USERNAME
+          value: "user"
+        - name: PHABRICATOR_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: phabricator
+              key: phabricator-password
+        - name: PHABRICATOR_EMAIL
+          value: "user@example.com"
+        - name: PHABRICATOR_FIRSTNAME
+          value: "First Name"
+        - name: PHABRICATOR_LASTNAME
+          value: "Last Name"
+        - name: PHABRICATOR_HOST
+          value: ""
+        - name: SMTP_HOST
+          value: ""
+        - name: SMTP_PORT
+          value: ""
+        - name: SMTP_USER
+          value: ""
+        - name: SMTP_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: phabricator
+              key: smtp-password
+        - name: SMTP_PROTOCOL
+          value: ""
+        ports:
+        - name: http
+          containerPort: 80
+        - name: https
+          containerPort: 443
+        livenessProbe:
+          exec:
+            command:
+            - harpoon
+            - status
+            - phabricator
+          initialDelaySeconds: 180
+          timeoutSeconds: 15
+        readinessProbe:
+          exec:
+            command:
+            - harpoon
+            - status
+            - phabricator
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+        volumeMounts:
+        - name: phabricator-data
+          mountPath: /bitnami/phabricator
+        - name: apache-data
+          mountPath: /bitnami/apache
+        - name: php-data
+          mountPath: /bitnami/php
+      volumes:
+      - name: phabricator-data
+        emptyDir: {}
+      - name: apache-data
+        emptyDir: {}
+      - name: php-data
+        emptyDir: {}
diff --git a/phabricator/manifests/phabricator-secrets.yaml b/phabricator/manifests/phabricator-secrets.yaml
new file mode 100644
index 000000000..eda035729
--- /dev/null
+++ b/phabricator/manifests/phabricator-secrets.yaml
@@ -0,0 +1,12 @@
+#helm:generate helmc tpl -d tpl/values.toml -o manifests/phabricator-secrets.yaml $HELM_GENERATE_FILE
+apiVersion: v1
+kind: Secret
+metadata:
+  name: phabricator
+  labels:
+    provider: phabricator
+    heritage: bitnami
+type: Opaque
+data:
+  phabricator-password: "Yml0bmFtaTE="
+  smtp-password: ""
diff --git a/phabricator/manifests/phabricator-svc.yaml b/phabricator/manifests/phabricator-svc.yaml
new file mode 100644
index 000000000..9a8949750
--- /dev/null
+++ b/phabricator/manifests/phabricator-svc.yaml
@@ -0,0 +1,22 @@
+#helm:generate helmc tpl -d tpl/values.toml -o manifests/phabricator-svc.yaml $HELM_GENERATE_FILE
+apiVersion: v1
+kind: Service
+metadata:
+  name: phabricator
+  labels:
+    app: phabricator
+    provider: phabricator-server
+    heritage: bitnami
+spec:
+  type: LoadBalancer
+  loadBalancerIP: 
+  ports:
+  - name: http
+    port: 80
+    targetPort: http
+  - name: https
+    port: 443
+    targetPort: https
+  selector:
+    app: phabricator
+    provider: phabricator-server
diff --git a/phabricator/tpl/phabricator-rc.yaml b/phabricator/tpl/phabricator-rc.yaml
new file mode 100644
index 000000000..33c350938
--- /dev/null
+++ b/phabricator/tpl/phabricator-rc.yaml
@@ -0,0 +1,99 @@
+#helm:generate helmc tpl -d tpl/values.toml -o manifests/phabricator-rc.yaml $HELM_GENERATE_FILE
+apiVersion: v1
+kind: ReplicationController
+metadata:
+  name: phabricator
+  labels:
+    app: phabricator
+    provider: phabricator-server
+    heritage: bitnami
+spec:
+  replicas: 1
+  selector:
+    app: phabricator
+    provider: phabricator-server
+    version: 2016.31-r0
+  template:
+    metadata:
+      labels:
+        app: phabricator
+        provider: phabricator-server
+        version: 2016.31-r0
+        heritage: bitnami
+    spec:
+      containers:
+      - name: phabricator
+        image: bitnami/phabricator:2016.31-r0
+        env:
+        - name: MARIADB_HOST
+          value: "mariadb"
+        - name: MARIADB_PORT
+          value: "3306"
+        - name: MARIADB_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: mariadb
+              key: mariadb-root-password
+        - name: PHABRICATOR_USERNAME
+          value: {{ .phabricatorUsername | quote }}
+        - name: PHABRICATOR_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: phabricator
+              key: phabricator-password
+        - name: PHABRICATOR_EMAIL
+          value: {{ .phabricatorEmail | quote }}
+        - name: PHABRICATOR_FIRSTNAME
+          value: {{ .phabricatorFirstName | quote }}
+        - name: PHABRICATOR_LASTNAME
+          value: {{ .phabricatorLastName | quote }}
+        - name: PHABRICATOR_HOST
+          value: {{ default .phabricatorHostIP .phabricatorHost | quote }}
+        - name: SMTP_HOST
+          value: {{ .smtpHost | quote }}
+        - name: SMTP_PORT
+          value: {{ .smtpPort | quote }}
+        - name: SMTP_USER
+          value: {{ .smtpUser | quote }}
+        - name: SMTP_PASSWORD
+          valueFrom:
+            secretKeyRef:
+              name: phabricator
+              key: smtp-password
+        - name: SMTP_PROTOCOL
+          value: {{ .smtpProtocol | quote }}
+        ports:
+        - name: http
+          containerPort: 80
+        - name: https
+          containerPort: 443
+        livenessProbe:
+          exec:
+            command:
+            - harpoon
+            - status
+            - phabricator
+          initialDelaySeconds: 180
+          timeoutSeconds: 15
+        readinessProbe:
+          exec:
+            command:
+            - harpoon
+            - status
+            - phabricator
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+        volumeMounts:
+        - name: phabricator-data
+          mountPath: /bitnami/phabricator
+        - name: apache-data
+          mountPath: /bitnami/apache
+        - name: php-data
+          mountPath: /bitnami/php
+      volumes:
+      - name: phabricator-data
+        emptyDir: {}
+      - name: apache-data
+        emptyDir: {}
+      - name: php-data
+        emptyDir: {}
diff --git a/phabricator/tpl/phabricator-secrets.yaml b/phabricator/tpl/phabricator-secrets.yaml
new file mode 100644
index 000000000..ff6921245
--- /dev/null
+++ b/phabricator/tpl/phabricator-secrets.yaml
@@ -0,0 +1,12 @@
+#helm:generate helmc tpl -d tpl/values.toml -o manifests/phabricator-secrets.yaml $HELM_GENERATE_FILE
+apiVersion: v1
+kind: Secret
+metadata:
+  name: phabricator
+  labels:
+    provider: phabricator
+    heritage: bitnami
+type: Opaque
+data:
+  phabricator-password: {{ .phabricatorPassword | b64enc | quote }}
+  smtp-password: {{ .smtpPassword | b64enc | quote }}
diff --git a/phabricator/tpl/phabricator-svc.yaml b/phabricator/tpl/phabricator-svc.yaml
new file mode 100644
index 000000000..17d155222
--- /dev/null
+++ b/phabricator/tpl/phabricator-svc.yaml
@@ -0,0 +1,22 @@
+#helm:generate helmc tpl -d tpl/values.toml -o manifests/phabricator-svc.yaml $HELM_GENERATE_FILE
+apiVersion: v1
+kind: Service
+metadata:
+  name: phabricator
+  labels:
+    app: phabricator
+    provider: phabricator-server
+    heritage: bitnami
+spec:
+  type: LoadBalancer
+  loadBalancerIP: {{ .phabricatorHostIP }}
+  ports:
+  - name: http
+    port: 80
+    targetPort: http
+  - name: https
+    port: 443
+    targetPort: https
+  selector:
+    app: phabricator
+    provider: phabricator-server
diff --git a/phabricator/tpl/values.toml b/phabricator/tpl/values.toml
new file mode 100644
index 000000000..c284d3821
--- /dev/null
+++ b/phabricator/tpl/values.toml
@@ -0,0 +1,12 @@
+phabricatorUsername = "user"
+phabricatorPassword = "bitnami1"
+phabricatorEmail = "user@example.com"
+phabricatorFirstName = "First Name"
+phabricatorLastName = "Last Name"
+phabricatorHost = ""
+phabricatorHostIP = ""
+smtpUser = ""
+smtpPassword = ""
+smtpHost = ""
+smtpPort = ""
+smtpProtocol = ""