diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go
index 75faed662..11530f7e6 100644
--- a/builder/amazon/common/run_config.go
+++ b/builder/amazon/common/run_config.go
@@ -11,21 +11,21 @@ import (
 // RunConfig contains configuration for running an instance from a source
 // AMI and details on how to access that launched image.
 type RunConfig struct {
-	SourceAmi                string   `mapstructure:"source_ami"`
+	AssociatePublicIpAddress bool     `mapstructure:"associate_public_ip_address"`
+	AvailabilityZone         string   `mapstructure:"availability_zone"`
 	IamInstanceProfile       string   `mapstructure:"iam_instance_profile"`
 	InstanceType             string   `mapstructure:"instance_type"`
-	UserData                 string   `mapstructure:"user_data"`
-	UserDataFile             string   `mapstructure:"user_data_file"`
+	SourceAmi                string   `mapstructure:"source_ami"`
 	RawSSHTimeout            string   `mapstructure:"ssh_timeout"`
 	SSHUsername              string   `mapstructure:"ssh_username"`
 	SSHPort                  int      `mapstructure:"ssh_port"`
 	SecurityGroupId          string   `mapstructure:"security_group_id"`
 	SecurityGroupIds         []string `mapstructure:"security_group_ids"`
 	SubnetId                 string   `mapstructure:"subnet_id"`
-	AssociatePublicIpAddress bool     `mapstructure:"associate_public_ip_address"`
 	TemporaryKeyPairName     string   `mapstructure:"temporary_key_pair_name"`
+	UserData                 string   `mapstructure:"user_data"`
+	UserDataFile             string   `mapstructure:"user_data_file"`
 	VpcId                    string   `mapstructure:"vpc_id"`
-	AvailabilityZone         string   `mapstructure:"availability_zone"`
 
 	// Unexported fields that are calculated from others
 	sshTimeout time.Duration