diff --git a/VERSION b/VERSION
index 8cb3045..335057a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.6.0-dev4
+3.6.0-dev5
diff --git a/rw_core/config/config.go b/rw_core/config/config.go
index 6370550..7cb644d 100644
--- a/rw_core/config/config.go
+++ b/rw_core/config/config.go
@@ -24,7 +24,7 @@
 
 // RW Core service default constants
 const (
-	EtcdStoreName = "etcd"
+	KVStoreName = "etcd"
 )
 
 // RWCoreFlags represents the set of configurations used by the read-write core service
@@ -101,7 +101,7 @@
 
 	fs.StringVar(&cf.KVStoreType,
 		"kv_store_type",
-		EtcdStoreName,
+		KVStoreName,
 		"KV store type")
 
 	fs.DurationVar(&cf.KVStoreTimeout,
diff --git a/rw_core/core/kv.go b/rw_core/core/kv.go
index 2a933f2..2df1187 100644
--- a/rw_core/core/kv.go
+++ b/rw_core/core/kv.go
@@ -31,8 +31,13 @@
 
 func newKVClient(ctx context.Context, storeType string, address string, timeout time.Duration) (kvstore.Client, error) {
 	logger.Infow(ctx, "kv-store-type", log.Fields{"store": storeType})
-	if storeType == "etcd" {
+	switch storeType {
+	case "etcd":
 		return kvstore.NewEtcdClient(ctx, address, timeout, log.FatalLevel)
+	case "redis":
+		return kvstore.NewRedisClient(address, timeout, false)
+	case "redis-sentinel":
+		return kvstore.NewRedisClient(address, timeout, true)
 	}
 	return nil, errors.New("unsupported-kv-store")
 }