diff --git a/app/components/cloud-host-add-or-edit/template.hbs b/app/components/cloud-host-add-or-edit/template.hbs
index 68d50e51a..3ac9301ee 100644
--- a/app/components/cloud-host-add-or-edit/template.hbs
+++ b/app/components/cloud-host-add-or-edit/template.hbs
@@ -1 +1 @@
-{{partial (concat 'host/host-templates/' hostTemplate.driver)}}
+{{partial 'host/host-templates/host-launch'}}
diff --git a/app/components/machine/driver-digitalocean/template.hbs b/app/components/machine/driver-digitalocean/template.hbs
index 995ccdb77..030727c34 100644
--- a/app/components/machine/driver-digitalocean/template.hbs
+++ b/app/components/machine/driver-digitalocean/template.hbs
@@ -1,20 +1,20 @@
 <section class="horizontal-form">
+  <div class="over-hr mt-20 mb-20">
+    <span>{{t 'machine.driverDigitalocean.instanceSection'}}</span>
+  </div>
+
+  <div class="row mb-20">
+    {{form-name-description
+        name=model.name
+        description=model.description
+        nameRequired=true
+        namePlaceholder="hostPartial.host.addCommon.new.form.name.placeholder"
+        descriptionShown=true
+        descriptionExpanded=true
+    }}
+  </div>
   {{#if step1}}
     <form>
-      <div class="over-hr mt-20 mb-20">
-        <span>{{t 'machine.driverDigitalocean.instanceSection'}}</span>
-      </div>
-
-      <div class="row mb-20">
-        {{form-name-description
-            name=model.name
-            description=model.description
-            nameRequired=true
-            namePlaceholder="hostPartial.host.addCommon.new.form.name.placeholder"
-            descriptionShown=true
-            descriptionExpanded=true
-        }}
-      </div>
 
       <div class="over-hr mb-20">
         <span>{{t 'machine.driverDigitalocean.accountSection'}}</span>
diff --git a/app/hosts/templates/launch/controller.js b/app/hosts/templates/launch/controller.js
index 3c48b75ca..7b9aaede8 100644
--- a/app/hosts/templates/launch/controller.js
+++ b/app/hosts/templates/launch/controller.js
@@ -3,12 +3,4 @@ import Ember from 'ember';
 export default Ember.Controller.extend({
   hostTemplate: Ember.computed.alias('model.template'),
   machineConfig: Ember.computed.alias('model.config'),
-  actions: {
-    save() {
-      debugger;
-    },
-    cancel() {
-      this.transitionToRoute('hosts.templates.index');
-    },
-  }
 });
diff --git a/app/hosts/templates/launch/route.js b/app/hosts/templates/launch/route.js
index 94f27080f..0b0758f88 100644
--- a/app/hosts/templates/launch/route.js
+++ b/app/hosts/templates/launch/route.js
@@ -20,5 +20,17 @@ export default Ember.Route.extend({
         host: this.get('store').createRecord(tmp)
       }
     });
-  }
+  },
+  actions: {
+    cancel() {
+      this.transitionTo('hosts.templates.index');
+    },
+    goBack() {
+      if ( this.get('backTo') === 'waiting' ) {
+        this.transitionTo('authenticated.project.waiting');
+      } else {
+        this.transitionTo('hosts');
+      }
+    }
+  },
 });
diff --git a/app/hosts/templates/launch/template.hbs b/app/hosts/templates/launch/template.hbs
index 60493cdd7..01575eb85 100644
--- a/app/hosts/templates/launch/template.hbs
+++ b/app/hosts/templates/launch/template.hbs
@@ -1,5 +1,6 @@
 {{cloud-host-add-or-edit
     host=model.host
     hostTemplate=model.template
-    cancel=(action 'cancel')
+    cancel=(route-action 'cancel')
+    goBack=(route-action 'goBack')
 }}
diff --git a/app/templates/host/host-templates/amazonec2.hbs b/app/templates/host/host-templates/amazonec2.hbs
index bba7fc0bd..732620b00 100644
--- a/app/templates/host/host-templates/amazonec2.hbs
+++ b/app/templates/host/host-templates/amazonec2.hbs
@@ -1,55 +1,14 @@
-<div class="hosts-cloud-add">
-  <section class="header clearfix">
-    <div class="row">
-      <div class="mb-0">
-        <h1>
-          {{t 'hostsPage.cloudHostsPage.addPage.header'}}
-        </h1>
-      </div>
-    </div>
-  </section>
-
-  <section class="mt-20">
-    <form>
-      <section class="horizontal-form">
-        <div class="row addtl-info">
-          <div class="col span-4">
-            <div class="nav-boxes driver">
-              <div class="nav-box-item driver machine-driver active {{parse-host-icon hostTemplate.driver}}"></div>
-            </div>
-          </div>
-          <div class="col span-8">
-            <div>
-              <label for="">{{t 'hostsPage.cloudHostsPage.addPage.instance'}}</label>
-              {{hostOptions.instanceType}}
-            </div>
-            <hr/>
-            <div>
-              <label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
-              {{hostOptions.region}}
-            </div>
-            <hr/>
-            <div>
-              <label for="">{{t 'hostsPage.cloudHostsPage.addPage.storage'}}</label>
-              {{hostOptions.rootSize}}
-            </div>
-          </div>
-        </div>
-        <div class="container-fluid">
-          {{partial "host/add-common"}}
-          <hr />
-          <div class="row">
-            <div class="col span-12">
-              {{#advanced-section}}
-                {{form-user-labels initialLabels=clonedModel.labels setLabels=(action 'setLabels') expandAll=null}}
-              {{/advanced-section}}
-            </div>
-          </div>
-        </div>
-        {{top-errors errors=errors}}
-        {{save-cancel save="save" cancel="cancel" createLabel='hostsPage.cloudHostsPage.addPage.launch'}}
-      </section>
-
-    </form>
-  </section>
+<div>
+  <label for="">{{t 'hostsPage.cloudHostsPage.addPage.instance'}}</label>
+  {{hostOptions.instanceType}}
+</div>
+<hr/>
+<div>
+  <label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
+  {{hostOptions.region}}
+</div>
+<hr/>
+<div>
+  <label for="">{{t 'hostsPage.cloudHostsPage.addPage.storage'}}</label>
+  {{hostOptions.rootSize}}
 </div>
\ No newline at end of file
diff --git a/app/templates/host/host-templates/azure.hbs b/app/templates/host/host-templates/azure.hbs
new file mode 100644
index 000000000..64559d973
--- /dev/null
+++ b/app/templates/host/host-templates/azure.hbs
@@ -0,0 +1,14 @@
+<div>
+  <label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
+  {{hostOptions.location}}
+</div>
+<hr/>
+<div>
+  <label for="">{{t 'hostsPage.cloudHostsPage.addPage.env'}}</label>
+  {{hostOptions.environment}}
+</div>
+<hr/>
+<div>
+  <label for="">{{t 'hostsPage.cloudHostsPage.addPage.size'}}</label>
+  {{hostOptions.size}}
+</div>
\ No newline at end of file
diff --git a/app/templates/host/host-templates/digitalocean.hbs b/app/templates/host/host-templates/digitalocean.hbs
index 6dadaf0c1..5e29d962b 100644
--- a/app/templates/host/host-templates/digitalocean.hbs
+++ b/app/templates/host/host-templates/digitalocean.hbs
@@ -1,51 +1,9 @@
-{{log hostOptions}}
-<div class="hosts-cloud-add">
-  <section class="header clearfix">
-    <div class="row">
-      <div class="mb-0">
-        <h1>
-          {{t 'hostsPage.cloudHostsPage.addPage.header'}}
-        </h1>
-      </div>
-    </div>
-  </section>
-
-  <section class="mt-20">
-    <form>
-      <section class="horizontal-form">
-        <div class="row addtl-info">
-          <div class="col span-4">
-            <div class="nav-boxes driver">
-              <div class="nav-box-item driver machine-driver active {{parse-host-icon hostTemplate.driver}}"></div>
-            </div>
-          </div>
-          <div class="col span-8">
-            <div>
-              <label for="">{{t 'hostsPage.cloudHostsPage.addPage.instance'}}</label>
-              {{hostOptions.size}}
-            </div>
-            <hr/>
-            <div>
-              <label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
-              {{hostOptions.region}}
-            </div>
-          </div>
-        </div>
-        <div class="container-fluid">
-          {{partial "host/add-common"}}
-          <hr />
-          <div class="row">
-            <div class="col span-12">
-              {{#advanced-section}}
-                {{form-user-labels initialLabels=clonedModel.labels setLabels=(action 'setLabels') expandAll=null}}
-              {{/advanced-section}}
-            </div>
-          </div>
-        </div>
-        {{top-errors errors=errors}}
-        {{save-cancel save="save" cancel="cancel" createLabel='hostsPage.cloudHostsPage.addPage.launch'}}
-      </section>
-
-    </form>
-  </section>
+<div>
+  <label for="">{{t 'hostsPage.cloudHostsPage.addPage.instance'}}</label>
+  {{hostOptions.size}}
+</div>
+<hr/>
+<div>
+  <label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
+  {{hostOptions.region}}
 </div>
\ No newline at end of file
diff --git a/app/templates/host/host-templates/host-launch.hbs b/app/templates/host/host-templates/host-launch.hbs
new file mode 100644
index 000000000..03817c9a5
--- /dev/null
+++ b/app/templates/host/host-templates/host-launch.hbs
@@ -0,0 +1,42 @@
+<div class="hosts-cloud-add">
+  <section class="header clearfix">
+    <div class="row">
+      <div class="mb-0">
+        <h1>
+          {{t 'hostsPage.cloudHostsPage.addPage.header'}}
+        </h1>
+      </div>
+    </div>
+  </section>
+
+  <section class="mt-20">
+    <form>
+      <section class="horizontal-form">
+        <div class="row addtl-info">
+          <div class="col span-4">
+            <div class="nav-boxes driver">
+              <div class="nav-box-item driver machine-driver active {{parse-host-icon hostTemplate.driver}}"></div>
+            </div>
+          </div>
+          <div class="col span-8">
+            {{partial (concat 'host/host-templates/' hostTemplate.driver)}}
+          </div>
+        </div>
+        <div class="container-fluid">
+          {{partial "host/add-common"}}
+          <hr />
+          <div class="row">
+            <div class="col span-12">
+              {{#advanced-section}}
+                {{form-user-labels initialLabels=clonedModel.labels setLabels=(action 'setLabels') expandAll=null}}
+              {{/advanced-section}}
+            </div>
+          </div>
+        </div>
+        {{top-errors errors=errors}}
+        {{save-cancel save="save" cancel="cancel" createLabel='hostsPage.cloudHostsPage.addPage.launch'}}
+      </section>
+
+    </form>
+  </section>
+</div>
\ No newline at end of file
diff --git a/app/templates/host/host-templates/packet.hbs b/app/templates/host/host-templates/packet.hbs
new file mode 100644
index 000000000..85e6ffb91
--- /dev/null
+++ b/app/templates/host/host-templates/packet.hbs
@@ -0,0 +1,14 @@
+<div>
+  <label for="">{{t 'hostsPage.cloudHostsPage.addPage.zone'}}</label>
+  {{hostOptions.facilityCode}}
+</div>
+<hr/>
+<div>
+  <label for="">{{t 'hostsPage.cloudHostsPage.addPage.instance'}}</label>
+  {{hostOptions.plan}}
+</div>
+<hr/>
+<div>
+  <label for="">{{t 'hostsPage.cloudHostsPage.addPage.os'}}</label>
+  {{hostOptions.os}}
+</div>
\ No newline at end of file
diff --git a/translations/en-us.yaml b/translations/en-us.yaml
index b53a53da9..38e6e4665 100644
--- a/translations/en-us.yaml
+++ b/translations/en-us.yaml
@@ -697,6 +697,9 @@ hostsPage:
       storage: 'Storage:'
       transfer: 'Transfer:'
       zone: 'Zone:'
+      env: 'Environment:'
+      size: 'Size:'
+      os: 'OS:'
     tabs:
       fav: Favorites
       browse: Browse