diff --git a/tasks/Amazon/main.yml b/tasks/Amazon/main.yml
index 43350dab..9cc9c246 100644
--- a/tasks/Amazon/main.yml
+++ b/tasks/Amazon/main.yml
@@ -10,7 +10,7 @@
       content: |
         [sensu]
         name=sensu
-        baseurl=http://repositories.sensuapp.org/yum/$basearch/
+        baseurl=https://sensu.global.ssl.fastly.net/yum/$releasever/$basearch/
         gpgcheck=0
         enabled=1
       owner: root
diff --git a/tasks/CentOS/main.yml b/tasks/CentOS/main.yml
index e5e320ef..2833f39c 100644
--- a/tasks/CentOS/main.yml
+++ b/tasks/CentOS/main.yml
@@ -10,7 +10,7 @@
       content: |
         [sensu]
         name=sensu
-        baseurl=http://repositories.sensuapp.org/yum/$basearch/
+        baseurl=https://sensu.global.ssl.fastly.net/yum/$releasever/$basearch/
         gpgcheck=0
         enabled=1
       owner: root
diff --git a/tasks/Debian/main.yml b/tasks/Debian/main.yml
index 8ae05484..3f2f545e 100644
--- a/tasks/Debian/main.yml
+++ b/tasks/Debian/main.yml
@@ -6,12 +6,12 @@
 
   - name: Ensure the Sensu APT repo GPG key is present
     apt_key:
-      url: http://repositories.sensuapp.org/apt/pubkey.gpg
+      url: https://sensu.global.ssl.fastly.net/apt/pubkey.gpg
       state: present
 
   - name: Ensure the Sensu Core APT repo is present
     apt_repository:
-      repo: 'deb     http://repositories.sensuapp.org/apt sensu main'
+      repo: "deb     https://sensu.global.ssl.fastly.net/apt {{ ansible_distribution_release }} main"
       state: present
       update_cache: true
 
diff --git a/tasks/Ubuntu/main.yml b/tasks/Ubuntu/main.yml
index af2af2c8..f54137e4 100644
--- a/tasks/Ubuntu/main.yml
+++ b/tasks/Ubuntu/main.yml
@@ -6,12 +6,12 @@
 
   - name: Ensure the Sensu APT repo GPG key is present
     apt_key:
-      url: http://repositories.sensuapp.org/apt/pubkey.gpg
+      url: https://sensu.global.ssl.fastly.net/apt/pubkey.gpg
       state: present
 
   - name: Ensure the Sensu Core APT repo is present
     apt_repository:
-      repo: 'deb     http://repositories.sensuapp.org/apt sensu main'
+      repo: "deb     https://sensu.global.ssl.fastly.net/apt {{ ansible_distribution_release }} main"
       state: present
       update_cache: true
 
diff --git a/vars/FreeBSD.yml b/vars/FreeBSD.yml
index 6e37921b..5e554f62 100644
--- a/vars/FreeBSD.yml
+++ b/vars/FreeBSD.yml
@@ -4,8 +4,8 @@
 
 # Sensu config/package properties
 sensu_config_path: /usr/local/etc/sensu
-sensu_pkg_version: 0.25.6_1
-sensu_pkg_download_url: http://sensu.global.ssl.fastly.net/freebsd/10.0/amd64/sensu-{{ sensu_pkg_version }}.txz
+sensu_pkg_version: 0.28.4_1
+sensu_pkg_download_url: https://sensu.global.ssl.fastly.net/freebsd/FreeBSD:{{ ansible_distribution_major_version }}:{{ ansible_architecture }}/sensu/sensu-{{ sensu_pkg_version }}.txz
 sensu_pkg_download_path: /root/sensu_latest.txz
 
 # RabbitMQ options