diff --git a/dali/base/dafdesc.cpp b/dali/base/dafdesc.cpp
index 7a811d589d6..60fd6c2650f 100644
--- a/dali/base/dafdesc.cpp
+++ b/dali/base/dafdesc.cpp
@@ -3699,12 +3699,20 @@ static void doInitializeStorageGroups(bool createPlanesFromGroups)
             if (cur.groupType == grp_thor)
                 cur.createStoragePlane(storage, 1);
         }
+    }
 
-        //Uncomment the following to trace the values that been generated
-        //printYAML(storage);
+    // Add storage planes defined in environment.xml
+    Owned<IPropertyTree> env = getHPCCEnvironment();
+    Owned<IPropertyTreeIterator> storagePlanes = env->getElements("Software/Globals/Storage/StoragePlane");
+    ForEach(*storagePlanes)
+    {
+        IPropertyTree & storagePlane = storagePlanes->query();
+        storage->addPropTree("planes", LINK(&storagePlane));
     }
-#endif
 
+    //Uncomment the following to trace the values that been generated
+    //printYAML(storage);
+#endif
 
     //Ensure that host groups that are defined in terms of other host groups are expanded out so they have an explicit list of hosts
     normalizeHostGroups();