diff --git a/apps/gocd/Chart.yaml b/apps/gocd/Chart.yaml
new file mode 100644
index 00000000..90c744ce
--- /dev/null
+++ b/apps/gocd/Chart.yaml
@@ -0,0 +1,9 @@
+apiVersion: v2
+name: gocd
+type: application
+version: 1.0.0
+dependencies:
+  - name: gocd
+    version: 2.8.0
+    repository: https://gocd.github.io/helm-chart
+
diff --git a/apps/gocd/values.yaml b/apps/gocd/values.yaml
new file mode 100644
index 00000000..a21028b5
--- /dev/null
+++ b/apps/gocd/values.yaml
@@ -0,0 +1,29 @@
+gocd:
+  server:
+    toleration:
+      - effect: "NoSchedule"
+        key: xquare/server
+        operator: "Equal"
+        value: "true"
+      - effect: "NoSchedule"
+        key: xquare/platform
+        operator: "Equal"
+        value: "true"
+      - effect: "NoSchedule"
+        key: xquare/test
+        operator: "Equal"
+        value: "true"
+  agent:
+    toleration:
+      - effect: "NoSchedule"
+        key: xquare/server
+        operator: "Equal"
+        value: "true"
+      - effect: "NoSchedule"
+        key: xquare/platform
+        operator: "Equal"
+        value: "true"
+      - effect: "NoSchedule"
+        key: xquare/test
+        operator: "Equal"
+        value: "true"
\ No newline at end of file
diff --git a/charts/xquare-application/values.yaml b/charts/xquare-application/values.yaml
index 8566cf74..81716cb8 100644
--- a/charts/xquare-application/values.yaml
+++ b/charts/xquare-application/values.yaml
@@ -134,6 +134,15 @@ projects:
         source:
           path: apps/grafana-tempo
           repoURL: https://github.com/team-xquare/k8s-resource.git
+        syncPolicy:
+          automated:
+            prune: false
+            selfHeal: true
+      - name: gocd
+        namespace: gocd
+        source:
+          path: apps/gocd
+          repoURL: https://github.com/team-xquare/k8s-resource.git
         syncPolicy:
           automated:
             prune: false