diff --git a/templates/boilerplate/config/storage.js b/templates/boilerplate/config/storage.js
index de123e3d3..d7d539014 100644
--- a/templates/boilerplate/config/storage.js
+++ b/templates/boilerplate/config/storage.js
@@ -3,9 +3,9 @@ module.exports = {
   default: {
     enabled: true,
     ipfs_bin: "ipfs",
-    provider: "ipfs",
     available_providers: ["ipfs"],
     upload: {
+      provider: "ipfs",
       host: "localhost",
       port: 5001
     },
@@ -29,8 +29,8 @@ module.exports = {
   // assumed to be the intended environment by `embark run`
   development: {
     enabled: true,
-    provider: "ipfs",
     upload: {
+      provider: "ipfs",
       host: "localhost",
       port: 5001,
       getUrl: "http://localhost:8080/ipfs/"
diff --git a/templates/demo/config/storage.js b/templates/demo/config/storage.js
index 1ed672154..92e919202 100644
--- a/templates/demo/config/storage.js
+++ b/templates/demo/config/storage.js
@@ -3,9 +3,9 @@ module.exports = {
   default: {
     enabled: true,
     ipfs_bin: "ipfs",
-    provider: "ipfs",
     available_providers: ["ipfs"],
     upload: {
+      provider: "ipfs",
       host: "localhost",
       port: 5001
     },
@@ -29,8 +29,8 @@ module.exports = {
   // assumed to be the intended environment by `embark run`
   development: {
     enabled: true,
-    provider: "ipfs",
     upload: {
+      provider: "ipfs",
       host: "localhost",
       port: 5001,
       getUrl: "http://localhost:8080/ipfs/"
diff --git a/test_apps/coverage_app/config/storage.js b/test_apps/coverage_app/config/storage.js
index 59ef12bf5..7ea9de274 100644
--- a/test_apps/coverage_app/config/storage.js
+++ b/test_apps/coverage_app/config/storage.js
@@ -2,9 +2,9 @@ module.exports = {
   default: {
     enabled: true,
     ipfs_bin: "ipfs",
-    provider: "ipfs",
     available_providers: ["ipfs"],
     upload: {
+      provider: "ipfs",
       host: "localhost",
       port: 5001
     },
@@ -25,8 +25,8 @@ module.exports = {
   },
   development: {
     enabled: true,
-    provider: "ipfs",
     upload: {
+      provider: "ipfs",
       host: "localhost",
       port: 5001,
       getUrl: "http://localhost:8080/ipfs/"