diff --git a/Makefile b/Makefile
index 45b02a0a2..69e22e381 100644
--- a/Makefile
+++ b/Makefile
@@ -331,13 +331,9 @@ push-bootstrap:
 CPDIR := cluster/plugin
 CPAWSDIR := $(CPDIR)/aws
 
-.PHONY: build-amp-aws-compiler
-build-amp-aws-compiler:
-	@cd $(CPAWSDIR) && $(MAKE) compiler
-
 .PHONY: build-amp-aws
-build-amp-aws: build-amp-aws-compiler
-	@cd $(CPAWSDIR) && $(MAKE) build
+build-amp-aws:
+	@cd $(CPAWSDIR) && $(MAKE) image
 
 # WARNING:
 # If the environment variables for $KEYNAME and $REGION are not set, the
diff --git a/cli/command/cluster/create.go b/cli/command/cluster/create.go
index b556fbd71..084239edf 100644
--- a/cli/command/cluster/create.go
+++ b/cli/command/cluster/create.go
@@ -27,7 +27,7 @@ func NewCreateCommand(c cli.Interface) *cobra.Command {
 	// during this refactoring.
 	flags.StringVar(&opts.name, "name", "", "Cluster Label")
 	flags.BoolVarP(&opts.notifications, "notifications", "n", false, "Enable/disable server notifications (default is 'false')")
-	//flags.StringVar(&opts.provider, "provider", "local", "Cluster provider (\"local\" (default) or \"aws\")")
+	flags.StringVar(&opts.provider, "provider", "local", "Cluster provider (\"local\" (default) or \"aws\")")
 	flags.StringVarP(&opts.registration, "registration", "r", configuration.RegistrationNone, "Specify the registration policy (possible values are 'none' or 'email')")
 	flags.StringVarP(&opts.tag, "tag", "t", c.Version(), "Specify tag for cluster images")
 
diff --git a/cluster/plugin/aws/plugin.go b/cluster/plugin/aws/plugin.go
index 99f3a7b7a..42a3af480 100644
--- a/cluster/plugin/aws/plugin.go
+++ b/cluster/plugin/aws/plugin.go
@@ -12,7 +12,7 @@ import (
 )
 
 const (
-	DefaultTemplateURL = "https://editions-us-east-1.s3.amazonaws.com/aws/edge/Docker.tmpl"
+	DefaultTemplateURL = "https://s3.amazonaws.com/io-amp-binaries/templates/v0.13.0/aws-swarm-asg.yml"
 )
 
 // RequestOptions stores raw request input options before transformation into a AWS SDK specific
@@ -174,4 +174,3 @@ func StackOutputToJSON(so []StackOutput) (string, error) {
 	}
 	return string(j), nil
 }
-