diff --git a/manifests/init.pp b/manifests/init.pp
index 6482ba0..4bf6a83 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,6 +1,8 @@
 # == Class: lodgeit
 #
-class lodgeit {
+class lodgeit(
+    $lodgeit_version = 'master'
+  ) {
   $packages = [ 'python-imaging',
                 'python-jinja2',
                 'python-pybabel',
@@ -8,9 +10,9 @@ class lodgeit {
                 'python-simplejson',
                 'python-pygments']
 
-  include ::httpd
+  include httpd
 
-  include ::pip
+  include pip
   httpd_mod { 'proxy':
     ensure => present,
   }
@@ -40,8 +42,9 @@ class lodgeit {
 
   vcsrepo { '/tmp/lodgeit-main':
     ensure   => latest,
+    revision => $lodgeit_version,
     provider => git,
-    source   => 'https://git.openstack.org/openstack-infra/lodgeit',
+    source   => 'https://opendev.org/opendev/lodgeit',
   }
 
 }
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 808b48d..e42a5bc 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -6,7 +6,7 @@ class lodgeit::mysql(
   $database_name = $name,
   $database_user = $name,
 ) {
-  class { '::mysql::server':
+  class { 'mysql::server':
     root_password    => $mysql_root_password,
     override_options => {
       'mysqld' => {
@@ -14,7 +14,7 @@ class lodgeit::mysql(
       }
     }
   }
-  include ::mysql::server::account_security
+  include mysql::server::account_security
 
   mysql::db { $database_name:
     user     => $database_user,
diff --git a/manifests/site.pp b/manifests/site.pp
index b4d6ce2..90c7e96 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -12,7 +12,7 @@ define lodgeit::site(
   $vhost_name = "paste.${name}.org",
 ) {
 
-  include ::httpd
+  include httpd
 
   ::httpd::vhost::proxy { $vhost_name:
     port            => 80,