diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 093118a21dfe798381737096efe6e4b4b75beab9..9c11bdf4400f99b2dac9c59dea1cbffcf5d82e3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,34 +85,12 @@ deploy_rook:
     - helm repo add rook-release https://charts.rook.io/release
     - helm repo update
   script:
-    - kubectl -n rook-ceph-external create secret generic --type=kubernetes.io/rook rook-ceph-mon
-        --from-literal=cluster-name=rook-ceph-external
-        --from-literal=fsid=35f230ce-5684-4625-bd91-cf67fc10818d
-        --from-literal=admin-secret=$ROOK_EXTERNAL_ADMIN_SECRET
-        --from-literal=mon-secret=mon-secret
-        --from-literal=ceph-username=
-        --from-literal=ceph-secret=
-    - kubectl -n rook-ceph-external create configmap rook-ceph-mon-endpoints
-        --from-literal=data=rz-sp-virt-01=91.184.37.197:3300,rz-sp-virt-02=91.184.37.202:3300,rz-sp-virt-04=91.184.37.200:3300
-        --from-literal=mapping={}
-        --from-literal=maxMonId=2
-    - kubectl -n rook-ceph-external create secret generic --type=kubernetes.io/rook rook-csi-rbd-node
-        --from-literal=userID=csi-rbd-node --from-literal=userKey=
-    - kubectl -n rook-ceph-external create secret generic --type=kubernetes.io/rook rook-csi-rbd-provisioner
-        --from-literal=userID=csi-rbd-provisioner
-        --from-literal=userKey=
-    - kubectl -n rook-ceph-external create secret generic --type=kubernetes.io/rook rook-csi-cephfs-node
-        --from-literal=adminID=csi-cephfs-node
-        --from-literal=adminKey=
-    - kubectl -n rook-ceph-external create secret generic --type=kubernetes.io/rook rook-csi-cephfs-provisioner
-        --from-literal=adminID=csi-cephfs-provisioner
-        --from-literal=adminKey=
-    - kubectl -n rook-ceph-external create secret generic --type=kubernetes.io/rook rgw-admin-ops-user
-        --from-literal=accessKey=
-        --from-literal=secretKey=
     - echo helm upgrade --install $CI_ENVIRONMENT_SLUG rook-release/rook-ceph
         --set podAnnotations.'app\.gitlab\.com'/env=$CI_ENVIRONMENT_SLUG
         --set podAnnotations.'app\.gitlab\.com'/app=$CI_PROJECT_PATH_SLUG
+    - echo helm upgrade --install $CI_ENVIRONMENT_SLUG ./custom-charts/teckids-rook-config
+        --set secrets.mon.admin_secret=$ROOK_EXTERNAL_ADMIN_SECRET
+        -f values/teckids_rook.yaml
     - echo kubectl -n $KUBE_NAMESPACE apply -f resources/rook_object_store.yaml
     - echo kubectl -n $KUBE_NAMESPACE apply -f resources/rook_external_cluster.yaml
 
diff --git a/resources/rook_external_cluster.yaml b/resources/rook_external_cluster.yaml
deleted file mode 100644
index 6290bc7e0fed636be66a84dd51ec0cc08857d9b8..0000000000000000000000000000000000000000
--- a/resources/rook_external_cluster.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: ceph.rook.io/v1
-kind: CephCluster
-metadata:
-  name: rook-ceph-external
-  namespace: rook-ceph-external
-spec:
-  external:
-    enable: true
-  crashCollector:
-    disable: true
diff --git a/resources/rook_object_store.yaml b/resources/rook_object_store.yaml
deleted file mode 100644
index 2f0e597953a68af6095989dde5b794335a7bbe14..0000000000000000000000000000000000000000
--- a/resources/rook_object_store.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: ceph.rook.io/v1
-kind: CephObjectStore
-metadata:
-  name: external-store
-spec:
-  gateway:
-    port: 7480
-    externalRgwEndpoints:
-      - ip: 91.184.37.197
-      - ip: 91.184.37.200
-      - ip: 91.184.37.202
-  healthCheck:
-    bucket:
-      enabled: true
-      interval: 60s
diff --git a/values/teckids_rook.yaml b/values/teckids_rook.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..fd426b2004e75c85a0fb8d17e1cdfe1d1825cc9a
--- /dev/null
+++ b/values/teckids_rook.yaml
@@ -0,0 +1,42 @@
+endpoints:
+  data: "rz-sp-virt-01=91.184.37.197:3300,rz-sp-virt-02=91.184.37.202:3300,rz-sp-virt-04=91.184.37.200:3300"
+  mapping: "{}"
+  maxMonId: "2"
+
+secrets:
+  mon:
+    cluster_name: "Teckids-Prod"
+    fsid: "35f230ce-5684-4625-bd91-cf67fc10818d"
+    admin_secret: "" # Set by ci
+    mon_secret: "mon_secret"
+    ceph_username: ""
+    ceph_secret: ""
+  rbd:
+    node:
+      userID: "csi_rbd_node"
+      userKey: ""
+    provisioner:
+      userID: "csi_rbd_provisioner"
+      userKey: ""
+  cephfs:
+    node:
+      adminID: "csi_cephfs_node"
+      adminKey: ""
+    provisioner:
+      adminID: "csi_cephfs_provisioner"
+      adminKey: ""
+  ops_user:
+    accessKey: ""
+    secretKey: ""
+
+object:
+  gateway:
+    port: 7480
+    externalEndpoints:
+      - ip: 91.184.37.197
+      - ip: 91.184.37.202
+      - ip: 91.184.37.202
+  healthCheck:
+    bucket:
+      enabled: true
+      interval: 60s