diff --git a/lib/config.py b/lib/config.py
index ee305d68633b4972ec91f49c2ea31ffd25c9cfae..8917f4db87edaf3991130a2e9dff88d41bae455f 100644
--- a/lib/config.py
+++ b/lib/config.py
@@ -1128,8 +1128,10 @@ class ConfigWriter:
     node_data = fn(node_names)
 
     cluster = self._config_data.cluster
+    cluster_tags = fn(cluster.GetTags())
     return {
       constants.SS_CLUSTER_NAME: cluster.cluster_name,
+      constants.SS_CLUSTER_TAGS: cluster_tags,
       constants.SS_FILE_STORAGE_DIR: cluster.file_storage_dir,
       constants.SS_MASTER_CANDIDATES: mc_data,
       constants.SS_MASTER_IP: cluster.master_ip,
diff --git a/lib/constants.py b/lib/constants.py
index a77544d0e353420ca27e80a7de4417a0696c36a5..058f2dd62e7daef392d4424d4a3899127ad41f3e 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -458,6 +458,7 @@ MAX_DISKS = 16
 
 # SSCONF keys
 SS_CLUSTER_NAME = "cluster_name"
+SS_CLUSTER_TAGS = "cluster_tags"
 SS_FILE_STORAGE_DIR = "file_storage_dir"
 SS_MASTER_CANDIDATES = "master_candidates"
 SS_MASTER_IP = "master_ip"
diff --git a/lib/ssconf.py b/lib/ssconf.py
index a8a8968ffcd6048dc66bc70e16c6c8812d69c86e..cce1141f073d4e807d49a24a6cbb5ab275b86dad 100644
--- a/lib/ssconf.py
+++ b/lib/ssconf.py
@@ -126,6 +126,7 @@ class SimpleStore(object):
   _SS_FILEPREFIX = "ssconf_"
   _VALID_KEYS = (
     constants.SS_CLUSTER_NAME,
+    constants.SS_CLUSTER_TAGS,
     constants.SS_FILE_STORAGE_DIR,
     constants.SS_MASTER_CANDIDATES,
     constants.SS_MASTER_IP,