diff --git a/README.md b/README.md
index 826db44..633f618 100644
--- a/README.md
+++ b/README.md
@@ -28,4 +28,4 @@ There are two ways to create the boilerplate for the puppet module.
 
 ## What's next
 
-Once the boilerplate created, in order to be compliant with the other modules, the files managed by [msync](https://github.com/puppet-community/modulesync), (or [configs](https://opendev.org/openstack/puppet-modulesync-configs/)) needs to be in the project folder. Once synced module is ready, announce its existence to the ML, make the proper patch to openstack-infra and finally wait for the reviews to do the rest.
+Once the boilerplate created, in order to be compliant with the other modules, the files managed by [msync](https://github.com/voxpupuli/modulesync), (or [configs](https://opendev.org/x/puppet-modulesync-configs/)) needs to be in the project folder. Once synced module is ready, announce its existence to the ML, make the proper patch to openstack-infra and finally wait for the reviews to do the rest.
diff --git a/contrib/bootstrap.sh b/contrib/bootstrap.sh
index 1602e8e..cbf794b 100644
--- a/contrib/bootstrap.sh
+++ b/contrib/bootstrap.sh
@@ -130,8 +130,8 @@ git add --all && git commit -am "puppet-${proj}: Initial Commit
 
 This is the initial commit for puppet-${proj}.
 It has been automatically generated using cookiecutter[1] and msync[2]
-[1] https://github.com/openstack/puppet-openstack-cookiecutter
-[2] https://github.com/openstack/puppet-modulesync-configs
+[1] https://opendev.org/openstack/puppet-openstack-cookiecutter
+[2] https://opendev.org/x/puppet-modulesync-configs
 "
 cleanup_gerrit_user
 popd
@@ -180,8 +180,8 @@ git add --all && git commit --amend -am "puppet-${proj}: Initial commit
 This is the initial commit for puppet-${proj}.
 It has been automatically generated using cookiecutter[1] and msync[2]
 
-[1] https://github.com/openstack/puppet-openstack-cookiecutter
-[2] https://github.com/openstack/puppet-modulesync-configs
+[1] https://opendev.org/openstack/puppet-openstack-cookiecutter
+[2] https://opendev.org/x/puppet-modulesync-configs
 "
 
 cleanup_gerrit_user
diff --git a/puppet-{{cookiecutter.project_name}}/.gitignore b/puppet-{{cookiecutter.project_name}}/.gitignore
index 149bf57..2850371 100644
--- a/puppet-{{cookiecutter.project_name}}/.gitignore
+++ b/puppet-{{cookiecutter.project_name}}/.gitignore
@@ -9,12 +9,17 @@
 #
 # git config --global core.excludesfile '~/.gitignore'
 
+pkg/
 Gemfile.lock
-spec/fixtures/modules/*
-spec/fixtures/manifests/site.pp
-pkg
 vendor/
-/openstack/
+spec/fixtures/
+.vagrant/
+.bundle/
+coverage/
+.idea/
+*.iml
+/openstack
+/log
 
 # Files created by releasenotes build
 releasenotes/build
diff --git a/puppet-{{cookiecutter.project_name}}/bindep.txt b/puppet-{{cookiecutter.project_name}}/bindep.txt
index 4f9b425..245e54a 100644
--- a/puppet-{{cookiecutter.project_name}}/bindep.txt
+++ b/puppet-{{cookiecutter.project_name}}/bindep.txt
@@ -1,2 +1,11 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
-# see http://docs.openstack.org/infra/bindep/ for additional information.
+# see https://docs.openstack.org/infra/bindep/ for additional information.
+
+libxml2-devel [test platform:rpm]
+libxml2-dev [test platform:dpkg]
+libxslt-devel [test platform:rpm]
+libxslt1-dev [test platform:dpkg]
+ruby-devel [test platform:rpm]
+ruby-dev [test platform:dpkg]
+zlib1g-dev [test platform:dpkg]
+zlib-devel [test platform:rpm]
diff --git a/puppet-{{cookiecutter.project_name}}/metadata.json b/puppet-{{cookiecutter.project_name}}/metadata.json
index 7f0bd8b..c49f8ba 100644
--- a/puppet-{{cookiecutter.project_name}}/metadata.json
+++ b/puppet-{{cookiecutter.project_name}}/metadata.json
@@ -65,7 +65,7 @@
             "version_requirement": ">= 6.0.0 < 7.0.0"
         }
     ],
-    "source": "git://github.com/openstack/puppet-{{cookiecutter.project_name}}.git",
+    "source": "https://opendev.org/openstack/puppet-{{cookiecutter.project_name}}",
     "summary": "Puppet module for OpenStack {{cookiecutter.project_name|capitalize}}",
     "version": "{{cookiecutter.version}}"
 }