diff --git a/bin/aws-eb-docker/launch-aws-eb.html.template b/bin/aws-eb-docker/launch-aws-eb.html.template
index 395244c6e9e171cbe3ab0aebc9cafe1563d8be54..b3d098c32041016efabcb52dd9fe71becb1497e9 100644
--- a/bin/aws-eb-docker/launch-aws-eb.html.template
+++ b/bin/aws-eb-docker/launch-aws-eb.html.template
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Redirecting...</title>
-<link rel=canonical href="https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&solutionStackName=Docker&sourceBundleUrl=https%3A%2F%2Fdownloads.metabase.com.s3.amazonaws.com%2F@@MB_TAG@@%2Fmetabase-aws-eb.zip&instanceType=t2.small&withRds=true&rdsDBEngine=postgres&rdsDBAllocatedStorage=10&rdsDBInstanceClass=db.t2.small&rdsMultiAZDatabase=false&rdsDBDeletionPolicy=Snapshot">
-<meta http-equiv=refresh content="0; url=https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&solutionStackName=Docker&sourceBundleUrl=https%3A%2F%2Fdownloads.metabase.com.s3.amazonaws.com%2F@@MB_TAG@@%2Fmetabase-aws-eb.zip&instanceType=t2.small&withRds=true&rdsDBEngine=postgres&rdsDBAllocatedStorage=10&rdsDBInstanceClass=db.t2.small&rdsMultiAZDatabase=false&rdsDBDeletionPolicy=Snapshot">
+<link rel=canonical href="https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&platform=Docker&sourceBundleUrl=https%3A%2F%2Fdownloads.metabase.com.s3.amazonaws.com%2F@@MB_TAG@@%2Fmetabase-aws-eb.zip&instanceType=t2.small&withRds=true&rdsDBEngine=postgres&rdsDBAllocatedStorage=10&rdsDBInstanceClass=db.t2.small&rdsMultiAZDatabase=false&rdsDBDeletionPolicy=Snapshot">
+<meta http-equiv=refresh content="0; url=https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&platform=Docker&sourceBundleUrl=https%3A%2F%2Fdownloads.metabase.com.s3.amazonaws.com%2F@@MB_TAG@@%2Fmetabase-aws-eb.zip&instanceType=t2.small&withRds=true&rdsDBEngine=postgres&rdsDBAllocatedStorage=10&rdsDBInstanceClass=db.t2.small&rdsMultiAZDatabase=false&rdsDBDeletionPolicy=Snapshot">
 <h1>Redirecting...</h1>
-<a href="https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&solutionStackName=Docker&sourceBundleUrl=https%3A%2F%2Fdownloads.metabase.com.s3.amazonaws.com%2F@@MB_TAG@@%2Fmetabase-aws-eb.zip&instanceType=t2.small&withRds=true&rdsDBEngine=postgres&rdsDBAllocatedStorage=10&rdsDBInstanceClass=db.t2.small&rdsMultiAZDatabase=false&rdsDBDeletionPolicy=Snapshot">Click here if you are not redirected.</a>
+<a href="https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&platform=Docker&sourceBundleUrl=https%3A%2F%2Fdownloads.metabase.com.s3.amazonaws.com%2F@@MB_TAG@@%2Fmetabase-aws-eb.zip&instanceType=t2.small&withRds=true&rdsDBEngine=postgres&rdsDBAllocatedStorage=10&rdsDBInstanceClass=db.t2.small&rdsMultiAZDatabase=false&rdsDBDeletionPolicy=Snapshot">Click here if you are not redirected.</a>
 <script>location='https://console.aws.amazon.com/elasticbeanstalk/home?region=us-east-1#/newApplication?applicationName=Metabase&tierName=WebServer&solutionStackName=Docker&sourceBundleUrl=https%3A%2F%2Fdownloads.metabase.com.s3.amazonaws.com%2F@@MB_TAG@@%2Fmetabase-aws-eb.zip&instanceType=t2.small&withRds=true&rdsDBEngine=postgres&rdsDBAllocatedStorage=10&rdsDBInstanceClass=db.t2.small&rdsMultiAZDatabase=false&rdsDBDeletionPolicy=Snapshot'</script>
diff --git a/docs/operations-guide/images/EBFirstScreen.png b/docs/operations-guide/images/EBFirstScreen.png
index 6dbc3ad26e967ab836e414b9cb93106202a303ed..583037119b9d708e0d5b7b753295bd74f2ef51b3 100644
Binary files a/docs/operations-guide/images/EBFirstScreen.png and b/docs/operations-guide/images/EBFirstScreen.png differ
diff --git a/docs/operations-guide/running-metabase-on-elastic-beanstalk.md b/docs/operations-guide/running-metabase-on-elastic-beanstalk.md
index 1635df40c4e6517428c14653a4097541284d3243..59e3dc021f8d92eb0eddeffe2c45a23074d0ba52 100644
--- a/docs/operations-guide/running-metabase-on-elastic-beanstalk.md
+++ b/docs/operations-guide/running-metabase-on-elastic-beanstalk.md
@@ -32,11 +32,11 @@ You should now see a screen that looks like
 
 NOTE: If this screenshot does not match what you see in the Elastic Beanstalk console, it is likely that you are on an old version of the Elastic Beanstalk UI. At the time of writing this documentation, both versions of the UI are being reported in the wild. You can view our older documentation [here](running-metabase-on-elastic-beanstalk-old.md)
 
-Elastic Beanstalk is organized into Applications and Environments, so to get started we must create a new Application.  Enter the application name `Metabase` and continue by clicking `Next`.
-
-![Elastic Beanstalk ApplicationInformation](images/EBApplicationInformation.png)
+While most of the fields are correctly prefilled by following the launch url above, "Sample Application" will be incorrectly selected. To run Metabase successfully, you'll need to click the radio button for "Upload your code".
 
+Elastic Beanstalk is organized into Applications and Environments, so to get started we must create a new Application. You can customize the application name here.
 
+![Elastic Beanstalk ApplicationInformation](images/EBApplicationInformation.png)
 
 ### Environment Information