diff --git a/storm/content.md b/storm/content.md
index 901567c666eb..a18b4a120319 100644
--- a/storm/content.md
+++ b/storm/content.md
@@ -1,6 +1,10 @@
 # What is Apache Storm?
 
-Apache Storm is a distributed computation framework written predominantly in the Clojure programming language. Originally created by Nathan Marz and team at BackType, the project was open sourced after being acquired by Twitter. It uses custom created "spouts" and "bolts" to define information sources and manipulations to allow batch, distributed processing of streaming data. The initial release was on 17 September 2011.
+Apache Storm is a free and open source distributed realtime computation system. Apache Storm makes it easy to reliably process unbounded streams of data, doing for realtime processing what Hadoop did for batch processing. Apache Storm is simple, can be used with any programming language, and is a lot of fun to use!
+
+Apache Storm has many use cases: realtime analytics, online machine learning, continuous computation, distributed RPC, ETL, and more. Apache Storm is fast: a benchmark clocked it at over a million tuples processed per second per node. It is scalable, fault-tolerant, guarantees your data will be processed, and is easy to set up and operate.
+
+Apache Storm integrates with the queueing and database technologies you already use. An Apache Storm topology consumes streams of data and processes those streams in arbitrarily complex ways, repartitioning the streams between each stage of the computation however needed.
 
 > [wikipedia.org/wiki/Storm_(event_processor)](https://en.wikipedia.org/wiki/Storm_(event_processor))
 
diff --git a/storm/get-help.md b/storm/get-help.md
new file mode 100644
index 000000000000..53940808e59c
--- /dev/null
+++ b/storm/get-help.md
@@ -0,0 +1 @@
+[Apache Storm™ community](https://storm.apache.org/getting-help.html)
diff --git a/storm/github-repo b/storm/github-repo
index a8b88815d9ba..0ff0b8656974 100644
--- a/storm/github-repo
+++ b/storm/github-repo
@@ -1 +1 @@
-https://github.com/31z4/storm-docker
+https://github.com/apache/storm-docker
diff --git a/storm/issues.md b/storm/issues.md
new file mode 100644
index 000000000000..d7535f9de99c
--- /dev/null
+++ b/storm/issues.md
@@ -0,0 +1 @@
+https://issues.apache.org/jira/browse/STORM
diff --git a/storm/license.md b/storm/license.md
index 995b917aadc5..4a6432f0ce75 100644
--- a/storm/license.md
+++ b/storm/license.md
@@ -1 +1,5 @@
-View [license information](http://storm.apache.org/about/free-and-open-source.html) for the software contained in this image.
+Apache Storm, Storm, Apache, the Apache feather logo, and the Apache Storm project logo are trademarks of The Apache Software Foundation.
+
+Licensed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0).
+
+See [license information](http://storm.apache.org/about/free-and-open-source.html).
diff --git a/storm/maintainer.md b/storm/maintainer.md
deleted file mode 120000
index e727ff0696ae..000000000000
--- a/storm/maintainer.md
+++ /dev/null
@@ -1 +0,0 @@
-../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/storm/maintainer.md b/storm/maintainer.md
new file mode 100644
index 000000000000..a08decbc7bfa
--- /dev/null
+++ b/storm/maintainer.md
@@ -0,0 +1 @@
+[Apache Storm](https://storm.apache.org/contribute/People.html)