diff --git a/etc/shaker.conf b/etc/shaker.conf
index 5018753..47e1a48 100644
--- a/etc/shaker.conf
+++ b/etc/shaker.conf
@@ -45,8 +45,8 @@
 # Scenario file name (string value)
 #scenario = <None>
 
-# Report template file name (Jinja format) (string value)
-#report_template = shaker/engine/report.template
+# Report template in Jinja format (string value)
+#report_template = shaker/resources/report_template.html
 
 # Report file name. If not specified print to stdout (string value)
 #report = <None>
@@ -58,6 +58,13 @@
 # Agent unique id (string value)
 #agent_id = <None>
 
+#
+# From shaker.engine.config
+#
+
+# Heat template for the image builder. (string value)
+#image_builder_template = shaker/resources/image_builder_template.yaml
+
 #
 # From shaker.openstack.common.log
 #
diff --git a/setup.cfg b/setup.cfg
index 50961a3..2ad60cf 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,8 +26,8 @@ packages =
 console_scripts =
     shaker = shaker.engine.server:main
     shaker-agent = shaker.agent.agent:main
-    shaker-image-builder = shaker.engine.installer:build_image
-    shaker-cleanup = shaker.engine.installer:cleanup
+    shaker-image-builder = shaker.engine.image_builder:build_image
+    shaker-cleanup = shaker.engine.image_builder:cleanup
 
 oslo.config.opts =
     shaker.openstack.common.log = shaker.openstack.common.log:list_opts
diff --git a/shaker/engine/config.py b/shaker/engine/config.py
index 2c7e577..98e3156 100644
--- a/shaker/engine/config.py
+++ b/shaker/engine/config.py
@@ -64,8 +64,8 @@ SERVER_OPTS = [
                help='Scenario file name'),
 
     cfg.StrOpt('report-template',
-               default='shaker/engine/report.template',
-               help='Report template file name (Jinja format)'),
+               default='shaker/resources/report_template.html',
+               help='Report template in Jinja format'),
     cfg.StrOpt('report',
                help='Report file name. If not specified print to stdout'),
 ]
@@ -76,9 +76,16 @@ AGENT_OPTS = [
                help='Agent unique id'),
 ]
 
+IMAGE_BUILDER_OPTS = [
+    cfg.StrOpt('image-builder-template',
+               default='shaker/resources/image_builder_template.yaml',
+               help='Heat template for the image builder.'),
+]
+
 
 def list_opts():
     yield (None, copy.deepcopy(COMMON_OPTS))
     yield (None, copy.deepcopy(OPENSTACK_OPTS))
     yield (None, copy.deepcopy(SERVER_OPTS))
     yield (None, copy.deepcopy(AGENT_OPTS))
+    yield (None, copy.deepcopy(IMAGE_BUILDER_OPTS))
diff --git a/shaker/engine/installer.py b/shaker/engine/image_builder.py
similarity index 95%
rename from shaker/engine/installer.py
rename to shaker/engine/image_builder.py
index 94453dc..58e21e7 100644
--- a/shaker/engine/installer.py
+++ b/shaker/engine/image_builder.py
@@ -34,7 +34,9 @@ def init():
     # init conf and logging
     conf = cfg.CONF
     conf.register_cli_opts(config.OPENSTACK_OPTS)
+    conf.register_cli_opts(config.IMAGE_BUILDER_OPTS)
     conf.register_opts(config.OPENSTACK_OPTS)
+    conf.register_opts(config.IMAGE_BUILDER_OPTS)
     conf(project='shaker')
 
     logging.setup('shaker')
@@ -68,7 +70,7 @@ def build_image():
             'stack_name': 'shaker_%s' % uuid.uuid4(),
             'parameters': {'external_net': external_net,
                            'flavor': flavor_name},
-            'template': utils.read_file('shaker/engine/installer.yaml'),
+            'template': utils.read_file(cfg.CONF.image_builder_template),
         }
 
         stack = openstack_client.heat.stacks.create(**stack_params)['stack']
diff --git a/shaker/engine/installer.yaml b/shaker/resources/image_builder_template.yaml
similarity index 100%
rename from shaker/engine/installer.yaml
rename to shaker/resources/image_builder_template.yaml
diff --git a/shaker/engine/report.template b/shaker/resources/report_template.html
similarity index 100%
rename from shaker/engine/report.template
rename to shaker/resources/report_template.html