diff --git a/accessbot/channels.yaml b/accessbot/channels.yaml
index 3ae900e0dc..21b2296806 100755
--- a/accessbot/channels.yaml
+++ b/accessbot/channels.yaml
@@ -61,6 +61,8 @@ global:
 
 # Individual channel configuration:
 channels:
+  - name: airshipit
+    mask: full_mask
   - name: ara
   - name: cloudkitty
   - name: congress
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 8722cc43b0..627a518d8b 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1,4 +1,14 @@
 # This file is sorted alphabetically by channel name.
+airshipit:
+  events:
+    - patchset-created
+    - change-merged
+    - x-vrif-minus-2
+  projects:
+    - ^openstack/airship-.*
+  branches:
+    - master
+
 ara:
   events:
     - patchset-created