diff --git a/servicecatalog_puppet/cli.py b/servicecatalog_puppet/cli.py
index ab6e192dd..237e196c8 100644
--- a/servicecatalog_puppet/cli.py
+++ b/servicecatalog_puppet/cli.py
@@ -625,8 +625,20 @@ def bootstrap_spoke(master_account_id):
     logger.info('Finished bootstrap of spoke')
 
 
+@cli.command()
+@click.argument('branch-name')
+def bootstrap_branch(branch_name):
+    global VERSION
+    VERSION = "https://github.com/awslabs/aws-service-catalog-puppet/archive/{}.zip".format(branch_name)
+    do_bootstrap()
+
+
 @cli.command()
 def bootstrap():
+    do_bootstrap()
+
+
+def do_bootstrap():
     logger.info('Starting bootstrap')
     with betterboto_client.MultiRegionClientContextManager('cloudformation', ALL_REGIONS) as clients:
         logger.info('Creating {}-regional'.format(BOOTSTRAP_STACK_NAME))
diff --git a/servicecatalog_puppet/servicecatalog-puppet.template.yaml b/servicecatalog_puppet/servicecatalog-puppet.template.yaml
index dc34afea8..a72a45efd 100644
--- a/servicecatalog_puppet/servicecatalog-puppet.template.yaml
+++ b/servicecatalog_puppet/servicecatalog-puppet.template.yaml
@@ -540,7 +540,11 @@ Resources:
           phases:
             install:
               commands:
+          {% if 'http' in VERSION %}
+                - pip install {{ VERSION }}
+          {% else %}
                 - pip install aws-service-catalog-puppet=={{ VERSION }}
+          {% endif %}
             build:
               commands:
                 - servicecatalog-puppet --info generate-shares manifest.yaml
@@ -569,7 +573,11 @@ Resources:
           phases:
             install:
               commands:
+          {% if 'http' in VERSION %}
+                - pip install {{ VERSION }}
+          {% else %}
                 - pip install aws-service-catalog-puppet=={{ VERSION }}
+          {% endif %}
             build:
               commands:
                 - servicecatalog-puppet --info deploy manifest.yaml
diff --git a/setup.py b/setup.py
index 56b110c24..20887854c 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="aws-service-catalog-puppet",
-    version="0.0.14",
+    version="0.0.15",
     author="Eamonn Faherty",
     author_email="aws-service-catalog-tools@amazon.com",
     description="Making it easier to deploy ServiceCatalog products",