diff --git a/playbooks/roles/go-agent/defaults/main.yml b/playbooks/roles/go-agent/defaults/main.yml
index d542fc4..d89aa31 100644
--- a/playbooks/roles/go-agent/defaults/main.yml
+++ b/playbooks/roles/go-agent/defaults/main.yml
@@ -13,7 +13,7 @@
 GO_AGENT_SERVICE_NAME: "go-agent"
 GO_AGENT_USER: "go"
 GO_AGENT_GROUP: "{{ GO_AGENT_USER }}"
-GO_AGENT_VERSION: "16.1.0-2855"
+GO_AGENT_VERSION: "16.4.0-3223"
 GO_AGENT_HOME: "/var/lib/go-agent/"
 GO_AGENT_CONF_HOME: "/etc/default/"
 
@@ -27,8 +27,8 @@ GO_AGENT_ORACLEJDK_LINK: "/usr/lib/jvm/java-7-oracle"
 GO_AGENT_JAVA_HOME: "{{ GO_AGENT_ORACLEJDK_LINK }}"
 
 # Aptitude settings
-GO_AGENT_APT_SOURCE: "deb http://dl.bintray.com/gocd/gocd-deb/ /"
-GO_AGENT_APT_KEY_URL: "https://bintray.com/user/downloadSubjectPublicKey?username=gocd"
+GO_AGENT_APT_SOURCE: "deb https://download.go.cd /"
+GO_AGENT_APT_KEY_URL: "https://download.go.cd/GOCD-GPG-KEY.asc"
 GO_AGENT_APT_NAME: "go-agent"
 
 # go-agent configuration settings
diff --git a/playbooks/roles/go-server/defaults/main.yml b/playbooks/roles/go-server/defaults/main.yml
index ac21e28..da3f7cd 100644
--- a/playbooks/roles/go-server/defaults/main.yml
+++ b/playbooks/roles/go-server/defaults/main.yml
@@ -13,7 +13,7 @@
 GO_SERVER_SERVICE_NAME: "go-server"
 GO_SERVER_USER: "go"
 GO_SERVER_GROUP: "{{ GO_SERVER_USER }}"
-GO_SERVER_VERSION: "16.1.0-2855"
+GO_SERVER_VERSION: "16.4.0-3223"
 GO_SERVER_HOME: "/var/lib/go-server"
 GO_SERVER_CONF_HOME: "/etc/go"
 GO_SERVER_PLUGIN_DIR: "{{ GO_SERVER_HOME }}/plugins/external/"
@@ -28,8 +28,8 @@ GO_SERVER_ORACLEJDK_LINK: "/usr/lib/jvm/java-7-oracle"
 GO_SERVER_JAVA_HOME: "{{ GO_SERVER_ORACLEJDK_LINK }}"
 
 # Aptitude settings
-GO_SERVER_APT_SOURCE: "deb http://dl.bintray.com/gocd/gocd-deb/ /"
-GO_SERVER_APT_KEY_URL: "https://bintray.com/user/downloadSubjectPublicKey?username=gocd"
+GO_SERVER_APT_SOURCE: "deb https://download.go.cd /"
+GO_SERVER_APT_KEY_URL: "https://download.go.cd/GOCD-GPG-KEY.asc"
 GO_SERVER_APT_NAME: "go-server"
 GO_SERVER_APT_PKGS: ["apache2-utils"]
 
diff --git a/playbooks/roles/go-server/tasks/setup_regular_backup.yml b/playbooks/roles/go-server/tasks/setup_regular_backup.yml
index 9c8d03f..290e38b 100644
--- a/playbooks/roles/go-server/tasks/setup_regular_backup.yml
+++ b/playbooks/roles/go-server/tasks/setup_regular_backup.yml
@@ -53,5 +53,5 @@
   cron:
     name: "gocd backup"
     minute: 0
-    hour: 2
-    job: "{{ GO_SERVER_BACKUP_CRON_SCRIPT_LOCATION }}"
+    hour: 3
+    job: "{{ GO_SERVER_BACKUP_CRON_SCRIPT_LOCATION }} 2>&1 | /usr/bin/logger -t gocd_backup"