diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 00000000..b2da45f6
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,9 @@
+---
+
+- project:
+    name: openstack/puppet-ceph
+    templates:
+      - puppet-openstack-check-jobs
+      - puppet-openstack-module-unit-jobs
+      - puppet-openstack-integration-jobs-scenario001
+      - puppet-openstack-integration-jobs-scenario004
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index caddc65d..5b8ef299 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source ENV['GEM_SOURCE'] || "https://rubygems.org"
 
 group :development, :test, :system_tests do
-  gem 'puppet-openstack_spec_helper', :require => 'false', :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper'
+  gem 'puppet-openstack_spec_helper', :require => 'false', :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper', :branch => 'stable/pike'
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
diff --git a/bindep.txt b/bindep.txt
index 7cdd58e5..d6645f86 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,5 +1,5 @@
 # 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]
@@ -9,3 +9,4 @@ ruby-devel [test platform:rpm]
 ruby-dev [test platform:dpkg]
 zlib1g-dev [test platform:dpkg]
 zlib-devel [test platform:rpm]
+puppet [build]
diff --git a/metadata.json b/metadata.json
index 75d64b56..ca7a89c2 100644
--- a/metadata.json
+++ b/metadata.json
@@ -53,7 +53,7 @@
         },
         {
             "name": "puppetlabs/apache",
-            "version_requirement": ">=1.4.1 <2.0.0"
+            "version_requirement": ">=1.4.1 <2.2.0"
         },
         {
             "name": "puppetlabs/concat",