diff --git a/playbooks/roles/go-agent/defaults/main.yml b/playbooks/roles/go-agent/defaults/main.yml
index e1ae4b1..416549c 100644
--- a/playbooks/roles/go-agent/defaults/main.yml
+++ b/playbooks/roles/go-agent/defaults/main.yml
@@ -18,9 +18,9 @@ GO_AGENT_HOME: "/var/lib/go-agent/"
 GO_AGENT_CONF_HOME: "/etc/default/"
 
 # Java version settings
-GO_AGENT_ORACLEJDK_VERSION: "7u51"
-GO_AGENT_ORACLEJDK_BASE: "jdk1.7.0_51"
-GO_AGENT_ORACLEJDK_BUILD: "b13"
+GO_AGENT_ORACLEJDK_VERSION: "7u80"
+GO_AGENT_ORACLEJDK_BASE: "jdk1.7.0_80"
+GO_AGENT_ORACLEJDK_BUILD: "b15"
 GO_AGENT_ORACLEJDK_LINK: "/usr/lib/jvm/java-7-oracle"
 
 # java tuning
@@ -34,4 +34,4 @@ GO_AGENT_APT_NAME: "go-agent"
 # go-agent configuration settings
 # override the server ip and port to connect an agent to it's go-server master.
 GO_AGENT_SERVER_IP: 127.0.0.1
-GO_AGENT_SERVER_PORT: 8153
\ No newline at end of file
+GO_AGENT_SERVER_PORT: 8153
diff --git a/playbooks/roles/go-server/defaults/main.yml b/playbooks/roles/go-server/defaults/main.yml
index 20b375f..8653e25 100644
--- a/playbooks/roles/go-server/defaults/main.yml
+++ b/playbooks/roles/go-server/defaults/main.yml
@@ -18,9 +18,9 @@ GO_SERVER_HOME: "/var/lib/go-server"
 GO_SERVER_CONF_HOME: "/etc/go/"
 
 # Java version settings
-GO_SERVER_ORACLEJDK_VERSION: "7u51"
-GO_SERVER_ORACLEJDK_BASE: "jdk1.7.0_51"
-GO_SERVER_ORACLEJDK_BUILD: "b13"
+GO_SERVER_ORACLEJDK_VERSION: "7u80"
+GO_SERVER_ORACLEJDK_BASE: "jdk1.7.0_80"
+GO_SERVER_ORACLEJDK_BUILD: "b15"
 GO_SERVER_ORACLEJDK_LINK: "/usr/lib/jvm/java-7-oracle"
 
 # java tuning
@@ -43,4 +43,4 @@ GO_SERVER_ADMIN_USERS: ["admin"]
 GO_SERVER_CRUISE_CONTROL_DB_DESTIONATION: "/var/lib/go-server/db/h2db/cruise.h2.db"
 
 # key for go-agents to autoregister with the go-server
-GO_SERVER_AUTO_REGISTER_KEY: "dev-only-override-this-key"
\ No newline at end of file
+GO_SERVER_AUTO_REGISTER_KEY: "dev-only-override-this-key"