diff --git a/manifests/mod/passenger.pp b/manifests/mod/passenger.pp
index 8cd9e8b36d..9019c33e41 100644
--- a/manifests/mod/passenger.pp
+++ b/manifests/mod/passenger.pp
@@ -837,7 +837,11 @@
 
   if $::osfamily == 'RedHat' and $manage_repo {
     if $::operatingsystem == 'Amazon' {
-      $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6Server/$basearch'
+      if $::operatingsystemmajrelease == '2' {
+        $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/7/$basearch'
+      } else {
+        $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/6/$basearch'
+      }
     } else {
       $baseurl = 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch'
     }
diff --git a/manifests/version.pp b/manifests/version.pp
index 7ebd591c59..6d2bb24d0b 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -11,8 +11,8 @@
       if $scl_httpd_version {
         $default = $scl_httpd_version
       }
-      elsif ($::operatingsystem == 'Amazon') {
-        $default = '2.2'
+      elsif ($::operatingsystem == 'Amazon' and $::operatingsystemmajrelease == '2') {
+        $default = '2.4'
       } elsif ($::operatingsystem == 'Fedora' and versioncmp($facts['operatingsystemmajrelease'], '18') >= 0) or ($::operatingsystem != 'Fedora' and versioncmp($facts['operatingsystemmajrelease'], '7') >= 0) {
         $default = '2.4'
       } else {