diff --git a/config/manager/etcd/envs.yaml b/config/manager/etcd/envs.yaml
index 2e7ec72..1fb35f5 100644
--- a/config/manager/etcd/envs.yaml
+++ b/config/manager/etcd/envs.yaml
@@ -14,26 +14,26 @@ spec:
             - name: ETCD_ENDPOINTS
               valueFrom:
                 secretKeyRef: 
-                  name: calico-route-reflector-etcd-config
+                  name: etcd-config
                   key: ETCD_ENDPOINTS
             - name: ETCD_DISCOVERY_SRV
               valueFrom:
                 secretKeyRef:
-                  name: calico-route-reflector-etcd-config
+                  name: etcd-config
                   key: ETCD_DISCOVERY_SRV
             - name: ETCD_USERNAME
               valueFrom:
                 secretKeyRef:
-                  name: calico-route-reflector-etcd-config
+                  name: etcd-config
                   key: ETCD_USERNAME
             - name: ETCD_PASSWORD
               valueFrom:
                 secretKeyRef:
-                  name: calico-route-reflector-etcd-config
+                  name: etcd-config
                   key: ETCD_PASSWORD
             - name: ETCD_KEY_FILE
-              value: "/root/etcd/ETCD_KEY_FILE"
+              value: "/etc/etcd/ETCD_KEY_FILE"
             - name: ETCD_CERT_FILE
-              value: "/root/etcd/ETCD_CERT_FILE"
+              value: "/etc/etcd/ETCD_CERT_FILE"
             - name: ETCD_CA_CERT_FILE
-              value: "/root/etcd/ETCD_CA_CERT_FILE"
\ No newline at end of file
+              value: "/etc/etcd/ETCD_CA_CERT_FILE"
\ No newline at end of file
diff --git a/config/manager/etcd/secret.yaml b/config/manager/etcd/secret.yaml
index 803ede7..5a16e82 100644
--- a/config/manager/etcd/secret.yaml
+++ b/config/manager/etcd/secret.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: calico-route-reflector-etcd-config
+  name: etcd-config
 type: Opaque
 data:
   ETCD_ENDPOINTS:
diff --git a/config/manager/etcd/volumes.yaml b/config/manager/etcd/volumes.yaml
index 8c9792b..2fdccc3 100644
--- a/config/manager/etcd/volumes.yaml
+++ b/config/manager/etcd/volumes.yaml
@@ -10,9 +10,9 @@ spec:
         - name: manager
           volumeMounts:
           - name: calico-route-reflector-etcd-config
-            mountPath: "/root/etcd"
+            mountPath: "/etc/etcd"
             readOnly: true
       volumes:
       - name: calico-route-reflector-etcd-config
         secret:
-          secretName: calico-route-reflector-etcd-config
+          secretName: etcd-config
diff --git a/config/manager/kdd/envs.yaml b/config/manager/kdd/envs.yaml
index 18b0d0d..edb5d2a 100644
--- a/config/manager/kdd/envs.yaml
+++ b/config/manager/kdd/envs.yaml
@@ -12,25 +12,25 @@ spec:
             - name: DATASTORE_TYPE
               value: "kubernetes"
             - name: KUBECONFIG
-              value: "/root/kdd/KUBECONFIG"
+              value: "/etc/kdd/KUBECONFIG"
             - name: K8S_API_ENDPOINT
               valueFrom:
                 secretKeyRef: 
-                  name: calico-route-reflector-kdd-config
+                  name: kdd-config
                   key: K8S_API_ENDPOINT
             - name: K8S_KEY_FILE
-              value: "/root/kdd/K8S_KEY_FILE"
+              value: "/etc/kdd/K8S_KEY_FILE"
             - name: K8S_CERT_FILE
-              value: "/root/kdd/K8S_CERT_FILE"
+              value: "/etc/kdd/K8S_CERT_FILE"
             - name: K8S_CA_FILE
-              value: "/root/kdd/K8S_CA_FILE"
+              value: "/etc/kdd/K8S_CA_FILE"
             - name: K8S_INSECURE_SKIP_TLS_VERIFY
               valueFrom:
                 secretKeyRef: 
-                  name: calico-route-reflector-kdd-config
+                  name: kdd-config
                   key: K8S_INSECURE_SKIP_TLS_VERIFY
             - name: K8S_DISABLE_NODE_POLL
               valueFrom:
                 secretKeyRef: 
-                  name: calico-route-reflector-kdd-config
+                  name: kdd-config
                   key: K8S_DISABLE_NODE_POLL
\ No newline at end of file
diff --git a/config/manager/kdd/secret.yaml b/config/manager/kdd/secret.yaml
index df81279..88d45d8 100644
--- a/config/manager/kdd/secret.yaml
+++ b/config/manager/kdd/secret.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: calico-route-reflector-kdd-config
+  name: kdd-config
 type: Opaque
 data:
   KUBECONFIG:
diff --git a/config/manager/kdd/volumes.yaml b/config/manager/kdd/volumes.yaml
index 90f3742..80f78eb 100644
--- a/config/manager/kdd/volumes.yaml
+++ b/config/manager/kdd/volumes.yaml
@@ -10,9 +10,9 @@ spec:
         - name: manager
           volumeMounts:
           - name: calico-route-reflector-kdd-config
-            mountPath: "/root/kdd"
+            mountPath: "/etc/kdd"
             readOnly: true
       volumes:
       - name: calico-route-reflector-kdd-config
         secret:
-          secretName: calico-route-reflector-kdd-config
+          secretName: kdd-config