diff --git a/Modulefile b/Modulefile
deleted file mode 100644
index 4fdf935..0000000
--- a/Modulefile
+++ /dev/null
@@ -1,11 +0,0 @@
-name 'puppetlabs-apache'
-version '0.0.4'
-source 'git://github.com/puppetlabs/puppetlabs-apache.git'
-author 'puppetlabs'
-license 'Apache 2.0'
-summary 'Puppet module for Apache'
-description 'Module for Apache configuration'
-project_page 'https://github.com/puppetlabs/puppetlabs-apache'
-
-## Add dependencies, if any:
-dependency 'puppetlabs-firewall', '>= 0.0.4'
diff --git a/Rakefile b/Rakefile
index e472112..ff1f0d7 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,21 +1,8 @@
-require 'rake'
-
+require 'rubygems'
+require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_autoloader_layout')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_class_parameter_defaults')
-
-task :default => [:spec]
-
-desc "Run all module spec tests (Requires rspec-puppet gem)"
-task :spec do
-  system("rspec spec")
-end
-
-desc "Build package"
-task :build do
-  system("puppet-module build")
-end
-
diff --git a/metadata.json b/metadata.json
new file mode 100644
index 0000000..00527ce
--- /dev/null
+++ b/metadata.json
@@ -0,0 +1,11 @@
+{
+  "name": "openstackci-httpd",
+  "version": "0.0.1",
+  "author": "Openstack CI",
+  "summary": "Puppet module for httpd",
+  "license": "Apache 2.0",
+  "source": "git://git.openstack.org/openstack-infra/puppet-httpd.git",
+  "project_page": "http://ci.openstack.org/",
+  "issues_url": "https://storyboard.openstack.org/#!/project/754",
+  "dependencies": []
+}