Finally a storage configuration that works

Change-Id: I911ce1b8481d1ba7be15cd29bcd3df6b7dcb4eb2