diff --git a/config/cds/sys.config b/config/cds/sys.config.gotmpl
similarity index 96%
rename from config/cds/sys.config
rename to config/cds/sys.config.gotmpl
index 5a01c7d..7711140 100644
--- a/config/cds/sys.config
+++ b/config/cds/sys.config.gotmpl
@@ -26,7 +26,7 @@
         {storage, cds_storage_riak},
         {cds_storage_riak, #{
             conn_params => #{
-                host => "riak",
+                host => "{{ .Values.services.riak.riakCdAddress | default "riak" }}",
                 port => 8087,
                 options => #{
                     connect_timeout => 1000,
diff --git a/config/cds/values.yaml.gotmpl b/config/cds/values.yaml.gotmpl
index 54cf93a..6003bbc 100644
--- a/config/cds/values.yaml.gotmpl
+++ b/config/cds/values.yaml.gotmpl
@@ -15,7 +15,7 @@ imagePullSecrets:
 configMap:
   data:
     sys.config: |
-      {{- readFile "sys.config" | nindent 6 }}
+      {{- tpl (readFile "sys.config.gotmpl") . | nindent 6 }}
     erl_inetrc: |
       {{- tpl (readFile "../vm/erl_inetrc.gotmpl") . | nindent 6 }}
     vm.args: |
diff --git a/config/machinegun/config.yaml.gotmpl b/config/machinegun/config.yaml.gotmpl
index 1928d3a..cd12891 100644
--- a/config/machinegun/config.yaml.gotmpl
+++ b/config/machinegun/config.yaml.gotmpl
@@ -19,7 +19,7 @@ woody_server:
 
 storage:
   type: riak
-  host: riak
+  host: {{ .Values.services.riak.riakMgAddress | default "riak" }}
   port: 8087
   pool:
     size: 100
diff --git a/default.values.yaml b/default.values.yaml
index 67f6c9a..fa46292 100644
--- a/default.values.yaml
+++ b/default.values.yaml
@@ -55,3 +55,7 @@ services:
 # If use Lets Encrypt for cert this value will be used as suffix for secrets with certs
       secretName: sometlssecret
 
+  riak:
+    splitDss: false
+    riakMgAddress: riak
+    riakCdAddress: riak