diff --git a/modules/meetbot/manifests/init.pp b/modules/meetbot/manifests/init.pp
index a8eb16c75c..156f9c0047 100644
--- a/modules/meetbot/manifests/init.pp
+++ b/modules/meetbot/manifests/init.pp
@@ -3,17 +3,17 @@ class vcs {
 
   exec { "update_meetbot_repo":
     command => "git pull --ff-only",
-    cwd => "/tmp/meetbot",
+    cwd => "/opt/meetbot",
     path => "/bin:/usr/bin",
-    onlyif => "test -d /tmp/meetbot"
+    onlyif => "test -d /opt/meetbot"
   }
 
 # otherwise get a new clone of it
 
   exec { "clone_meebot_repo":
-    command => "git clone https://github.com/emonty/meetbot.git /tmp/meetbot",
+    command => "git clone https://github.com/openstack-ci/meetbot.git /opt/meetbot",
     path => "/bin:/usr/bin",
-    onlyif => "test ! -d /tmp/meetbot"
+    onlyif => "test ! -d /opt/meetbot"
   }
 }
 
@@ -53,7 +53,7 @@ class meetbot {
   file { "/usr/share/pyshared/supybot/plugins/MeetBot":
     ensure => directory,
     recurse => true,
-    source => "/tmp/meetbot/MeetBot",
+    source => "/opt/meetbot/MeetBot",
     require => Package["supybot"]
   }
 
diff --git a/modules/meetbot/manifests/site.pp b/modules/meetbot/manifests/site.pp
index 3e520ab72b..c1b92e66ad 100644
--- a/modules/meetbot/manifests/site.pp
+++ b/modules/meetbot/manifests/site.pp
@@ -64,7 +64,7 @@ define meetbot::site($nick, $network, $server, $url, $channels, $use_ssl) {
   file { "/var/lib/meetbot/${name}/ircmeeting":
     ensure => directory,
     recurse => true,
-    source => "/tmp/meetbot/ircmeeting",
+    source => "/opt/meetbot/ircmeeting",
     owner => 'meetbot',
     require => File["/var/lib/meetbot/${name}"]
   }