diff --git a/boilerplate/config/blockchain.yml b/boilerplate/config/blockchain.yml
index 7efb2258..0eafb67b 100644
--- a/boilerplate/config/blockchain.yml
+++ b/boilerplate/config/blockchain.yml
@@ -3,7 +3,7 @@ development:
   rpc_port: 8101
   rpc_whitelist: "*"
   minerthreads: 1
-  genesis_block: config/genesis.json
+  genesis_block: config/genesis/dev_genesis.json
   datadir: /tmp/embark
   mine_when_needed: true
   max_peers: 0
diff --git a/boilerplate/config/genesis.json b/boilerplate/config/genesis/dev_genesis.json
similarity index 100%
rename from boilerplate/config/genesis.json
rename to boilerplate/config/genesis/dev_genesis.json
diff --git a/demo/config/blockchain.yml b/demo/config/blockchain.yml
index 0457f510..0072c4cb 100644
--- a/demo/config/blockchain.yml
+++ b/demo/config/blockchain.yml
@@ -3,7 +3,7 @@ development:
   rpc_port: 8101
   rpc_whitelist: "*"
   minerthreads: 1
-  genesis_block: config/genesis.json
+  genesis_block: config/genesis/dev_genesis.json
   datadir: /tmp/embark
   mine_when_needed: true
   gas_limit: 500000
diff --git a/demo/config/genesis.json b/demo/config/genesis/dev_genesis.json
similarity index 100%
rename from demo/config/genesis.json
rename to demo/config/genesis/dev_genesis.json