diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index 9d232ccc..e7550397 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -16,7 +16,7 @@ DIB_DEFAULT_MAPR_VERSION="5.2.0"
 DIB_DEFAULT_SPARK_VERSION="2.3.0"
 
 # The default version for Storm plugin
-DIB_DEFAULT_STORM_VERSION="1.1.0"
+DIB_DEFAULT_STORM_VERSION="1.2.1"
 
 # Bare metal image generation is enabled with the -b flag, it is off by default
 SIE_BAREMETAL="false"
@@ -35,7 +35,7 @@ usage() {
     echo "         [-v 2.7.1|2.7.5|2.8.2|3.0.1|5.5|5.7|5.9|5.11|2.2.0.0|2.2.1.0|2.4.2.0]"
     echo "         [-r 5.1.0|5.2.0]"
     echo "         [-s 1.6.0|2.1.0|2.2.0|2.3.0]"
-    echo "         [-t 0.9.2|1.0.1|1.1.0|1.1.1]"
+    echo "         [-t 1.0.1|1.1.0|1.1.1|1.2.0|1.2.1]"
     echo "         [-f qcow2|raw]"
     echo "         [-d]"
     echo "         [-u]"
@@ -233,7 +233,7 @@ case "$PLUGIN" in
         esac
 
         case "$DIB_STORM_VERSION" in
-            "0.9.2" | "1.0.1" | "1.1.0" | "1.1.1");;
+            "1.0.1" | "1.1.0" | "1.1.1" | "1.2.0" | "1.2.1");;
             "")
                 echo "Storm version not specified"
                 echo "Storm ${DIB_DEFAULT_STORM_VERSION} will be used"
diff --git a/elements/storm/install.d/60-storm b/elements/storm/install.d/60-storm
index cf89a4be..1a11e25a 100755
--- a/elements/storm/install.d/60-storm
+++ b/elements/storm/install.d/60-storm
@@ -23,10 +23,6 @@ if [ -z "${STORM_DOWNLOAD_URL:-}" ]; then
 
 # Check storm version
     case "$DIB_STORM_VERSION" in
-        0.9.*)
-            STORM_DOWNLOAD_URL="http://archive.apache.org/dist/incubator/storm/apache-storm-$DIB_STORM_VERSION-incubating/apache-storm-$DIB_STORM_VERSION-incubating.tar.gz"
-            STORM_FOLDER=apache-storm-$DIB_STORM_VERSION-incubating
-        ;;
         1.*)
             STORM_DOWNLOAD_URL="https://archive.apache.org/dist/storm/apache-storm-$DIB_STORM_VERSION/apache-storm-$DIB_STORM_VERSION.tar.gz"
             STORM_FOLDER=apache-storm-$DIB_STORM_VERSION
diff --git a/elements/storm/root.d/50-download-storm b/elements/storm/root.d/50-download-storm
index ff0e544e..ea77fc68 100755
--- a/elements/storm/root.d/50-download-storm
+++ b/elements/storm/root.d/50-download-storm
@@ -17,9 +17,6 @@ echo "Downloading Storm"
 if [ -z "${STORM_DOWNLOAD_URL:-}" ]; then
 # Check storm version
     case "$DIB_STORM_VERSION" in
-        0.9.*)
-            STORM_DOWNLOAD_URL="http://archive.apache.org/dist/incubator/storm/apache-storm-$DIB_STORM_VERSION-incubating/apache-storm-$DIB_STORM_VERSION-incubating.tar.gz"
-        ;;
         1.*)
             STORM_DOWNLOAD_URL="https://archive.apache.org/dist/storm/apache-storm-$DIB_STORM_VERSION/apache-storm-$DIB_STORM_VERSION.tar.gz"
             echo $STORM_DOWNLOAD_URL