diff --git a/sahara/plugins/default_templates/cdh/v5_5_0/cluster.json b/sahara/plugins/default_templates/cdh/v5_5_0/cluster.json
index 2a7669ce55..8fc62056a8 100644
--- a/sahara/plugins/default_templates/cdh/v5_5_0/cluster.json
+++ b/sahara/plugins/default_templates/cdh/v5_5_0/cluster.json
@@ -5,7 +5,7 @@
         {
             "name": "worker-nodemanager-datanode",
             "count": 3,
-            "node_group_template_id": "{cdh-550-default-worker-nodemanager-datanode}"
+            "node_group_template_id": "{cdh-550-default-nodemanager-datanode}"
         },
         {
             "name": "manager",
diff --git a/sahara/plugins/default_templates/cdh/v5_5_0/master-core.json b/sahara/plugins/default_templates/cdh/v5_5_0/master-core.json
index 825280b60b..8219216784 100644
--- a/sahara/plugins/default_templates/cdh/v5_5_0/master-core.json
+++ b/sahara/plugins/default_templates/cdh/v5_5_0/master-core.json
@@ -2,7 +2,7 @@
     "plugin_name": "cdh",
     "hadoop_version": "5.5.0",
     "node_processes": [
-        "HDFS_DATANODE",
+        "HDFS_NAMENODE",
         "YARN_RESOURCEMANAGER",
         "SENTRY_SERVER",
         "YARN_NODEMANAGER",
diff --git a/sahara/plugins/default_templates/cdh/v5_7_0/cluster.json b/sahara/plugins/default_templates/cdh/v5_7_0/cluster.json
index a53ba26abe..6dd9ee3805 100644
--- a/sahara/plugins/default_templates/cdh/v5_7_0/cluster.json
+++ b/sahara/plugins/default_templates/cdh/v5_7_0/cluster.json
@@ -5,7 +5,7 @@
         {
             "name": "worker-nodemanager-datanode",
             "count": 3,
-            "node_group_template_id": "{cdh-570-default-worker-nodemanager-datanode}"
+            "node_group_template_id": "{cdh-570-default-nodemanager-datanode}"
         },
         {
             "name": "manager",
diff --git a/sahara/plugins/default_templates/cdh/v5_7_0/master-core.json b/sahara/plugins/default_templates/cdh/v5_7_0/master-core.json
index 0b7369764e..1bbaa90f6d 100644
--- a/sahara/plugins/default_templates/cdh/v5_7_0/master-core.json
+++ b/sahara/plugins/default_templates/cdh/v5_7_0/master-core.json
@@ -2,7 +2,7 @@
     "plugin_name": "cdh",
     "hadoop_version": "5.7.0",
     "node_processes": [
-        "HDFS_DATANODE",
+        "HDFS_NAMENODE",
         "YARN_RESOURCEMANAGER",
         "SENTRY_SERVER",
         "YARN_NODEMANAGER",
diff --git a/sahara/plugins/default_templates/cdh/v5_9_0/cluster.json b/sahara/plugins/default_templates/cdh/v5_9_0/cluster.json
index d936351e37..cc85f264e8 100644
--- a/sahara/plugins/default_templates/cdh/v5_9_0/cluster.json
+++ b/sahara/plugins/default_templates/cdh/v5_9_0/cluster.json
@@ -5,7 +5,7 @@
         {
             "name": "worker-nodemanager-datanode",
             "count": 3,
-            "node_group_template_id": "{cdh-590-default-worker-nodemanager-datanode}"
+            "node_group_template_id": "{cdh-590-default-nodemanager-datanode}"
         },
         {
             "name": "manager",
diff --git a/sahara/plugins/default_templates/cdh/v5_9_0/master-core.json b/sahara/plugins/default_templates/cdh/v5_9_0/master-core.json
index 6a3abf8e55..be10803964 100644
--- a/sahara/plugins/default_templates/cdh/v5_9_0/master-core.json
+++ b/sahara/plugins/default_templates/cdh/v5_9_0/master-core.json
@@ -2,7 +2,7 @@
     "plugin_name": "cdh",
     "hadoop_version": "5.9.0",
     "node_processes": [
-        "HDFS_DATANODE",
+        "HDFS_NAMENODE",
         "YARN_RESOURCEMANAGER",
         "SENTRY_SERVER",
         "YARN_NODEMANAGER",