diff --git a/diagrams/onprem/analytics.py b/diagrams/onprem/analytics.py
index 5ee1f79..7a9554e 100644
--- a/diagrams/onprem/analytics.py
+++ b/diagrams/onprem/analytics.py
@@ -24,6 +24,10 @@ class Hive(_Analytics):
     _icon = "hive.png"
 
 
+class Norikra(_Analytics):
+    _icon = "norikra.png"
+
+
 class Spark(_Analytics):
     _icon = "spark.png"
 
diff --git a/diagrams/onprem/data.py b/diagrams/onprem/data.py
index eb14cf8..dbe03cb 100644
--- a/diagrams/onprem/data.py
+++ b/diagrams/onprem/data.py
@@ -12,12 +12,4 @@ class Embulk(_Data):
     _icon = "embulk.png"
 
 
-class Fluentd(_Data):
-    _icon = "fluentd.png"
-
-
-class Norikra(_Data):
-    _icon = "norikra.png"
-
-
 # Aliases
diff --git a/docs/nodes/onprem.md b/docs/nodes/onprem.md
index dcfd5c8..0159b04 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -119,8 +119,6 @@ Node classes list of onprem provider.
 ## onprem.data
 
 - **diagrams.onprem.data.Embulk**
-- **diagrams.onprem.data.Fluentd**
-- **diagrams.onprem.data.Norikra**
 
 ## onprem.client
 
@@ -139,5 +137,6 @@ Node classes list of onprem provider.
 - **diagrams.onprem.analytics.Flink**
 - **diagrams.onprem.analytics.Hadoop**
 - **diagrams.onprem.analytics.Hive**
+- **diagrams.onprem.analytics.Norikra**
 - **diagrams.onprem.analytics.Spark**
 - **diagrams.onprem.analytics.Storm**
diff --git a/resources/onprem/analytics/norikra.png b/resources/onprem/analytics/norikra.png
new file mode 100644
index 0000000..8505cfb
Binary files /dev/null and b/resources/onprem/analytics/norikra.png differ