diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index bda4e0625..52ad0fb74 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,11 +31,12 @@ goals for the sprint they are assigned to.
 ### Coding Conventions
 
 Airship has a set of [coding conventions](
-https://airship-docs.readthedocs.io/en/latest/conventions.html) that are meant
+https://docs.airshipit.org/develop/conventions.html) that are meant
 to cover all Airship subprojects.
 
 However, airshipctl also has its own specific coding conventions and standards
-in the official airshipctl [developer guide](docs/source/developers.md).
+in the official airshipctl [developer guide](
+https://doc.airshipit.org/airshipctl/developers.html).
 
 ### Submitting Changes
 
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index e4d6c6618..aed04abf1 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -11,17 +11,14 @@
 # limitations under the License.
 
 - project:
-    templates:
-      - docs-on-readthedocs
     vars:
-      rtd_project_name: airship-airshipctl
-      rtd_webhook_id: 112688
       sphinx_build_dir: docs/build
     check:
       jobs:
         - airship-airshipctl-roles-test:
             files:
               - "roles/*"
+        - openstack-tox-docs
         - airship-airshipctl-lint-unit
         - airship-airshipctl-build-image
 #        - airship-airshipctl-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up
@@ -29,6 +26,8 @@
         - airship-airshipctl-32GB-gate-test
     gate:
       jobs:
+        - openstack-tox-docs
+        - airship-airshipctl-lint-unit
         - airship-airshipctl-lint-unit
         - airship-airshipctl-build-image
 #        - airship-airshipctl-functional-existing-k8s TODO: Enable this when functional tests exist, and a cluster is up