diff --git a/bin/deploy b/bin/deploy
index d270a6fe0..edd1ffefa 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -14,7 +14,13 @@ end
 include SSHKit::DSL
 
 config_variant = "-#{ARGV[0]}" if ARGV[0]
+
+begin
 config = YAML.load_file("config/deploy#{config_variant}.yml")
+rescue Errno::ENOENT
+  puts "No deploy config found for #{config_variant || "default" }"
+  exit 1
+end
 
 HOSTS = [ config["host"] ]
 REMOTE_USER = config["ssh_user"]
diff --git a/config/deploy.yml b/config/deploy-beta.yml
similarity index 100%
rename from config/deploy.yml
rename to config/deploy-beta.yml
diff --git a/config/deploy-staging.yml b/config/deploy-production.yml
similarity index 100%
rename from config/deploy-staging.yml
rename to config/deploy-production.yml