diff --git a/Dockerfile b/Dockerfile
index 686cbae..e247ea8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM rails:onbuild
-MAINTAINER mccabe615
+MAINTAINER owasp
 
 ADD script/start /start
 
diff --git a/Vagrantfile b/Vagrantfile
index b526aa9..37788ef 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,7 +3,7 @@ ENV['VAGRANT_DEFAULT_PROVIDER'] ||= 'docker'
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.define "railsgoat" do |rg|
     rg.vm.provider "docker" do |d|
-      d.image = "mccabe615/railsgoat"
+      d.image = "owasp/railsgoat"
       d.name = "railsgoat"
       d.ports = ["3000:3000"]
       d.vagrant_vagrantfile = "./Vagrantfile.proxy"