diff --git a/accessbot/channels.yaml b/accessbot/channels.yaml
index 9ad5294594..c2a1b6b027 100755
--- a/accessbot/channels.yaml
+++ b/accessbot/channels.yaml
@@ -118,6 +118,7 @@ channels:
   - name: openstack-ec2api
   - name: openstack-ekko
   - name: openstack-entropy
+  - name: openstack-fenix
   - name: openstack-foundation
   - name: openstack-forum
   - name: openstack-foxnut
diff --git a/gerrit/acls/openstack/fenix.config b/gerrit/acls/openstack/fenix.config
new file mode 100644
index 0000000000..3c86018bc5
--- /dev/null
+++ b/gerrit/acls/openstack/fenix.config
@@ -0,0 +1,12 @@
+[access "refs/heads/*"]
+abandon = group fenix-core
+create = group fenix-release
+label-Code-Review = -2..+2 group fenix-core
+label-Workflow = -1..+1 group fenix-core
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 0ed1c4e325..0dcc23f201 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -3172,6 +3172,9 @@
 - project: openstack/fairy-slipper
   description: RETIRED, API documentation generator and builder for OpenStack
   acl-config: /home/gerrit2/acls/openstack/retired.config
+- project: openstack/fenix
+  description: OpenStack host maintenance and upgrade in interaction with
+    application on top of it
 - project: openstack/fixtures-git
   description: A git fixture using the fixtures API for writing tests for tools that
     use git.
@@ -5815,6 +5818,9 @@
 - project: openstack/puppet-ec2api
   description: OpenStack EC2 API Puppet Module
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
+- project: openstack/puppet-fenix
+  description: OpenStack Fenix Puppet Module
+  acl-config: /home/gerrit2/acls/openstack/fenix.config
 - project: openstack/puppet-freezer
   description: OpenStack Freezer Puppet Module
   acl-config: /home/gerrit2/acls/openstack/puppet-modules.config
@@ -6049,6 +6055,9 @@
 - project: openstack/python-evoqueclient
   description: RETIRED, Client library for Evoque API
   acl-config: /home/gerrit2/acls/openstack/retired.config
+- project: openstack/python-fenixclient
+  description: Fenix API Client library
+  acl-config: /home/gerrit2/acls/openstack/fenix.config
 - project: openstack/python-freezerclient
   description: Client cli and Library for Freezer API and storages media
   acl-config: /home/gerrit2/acls/openstack/freezer.config
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 632bcd561f..4ee7bb4efe 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -519,6 +519,18 @@ openstack-entropy:
   branches:
     - master
 
+openstack-fenix:
+  events:
+    - patchset-created
+    - change-merged
+    - x-vrif-minus-2
+  projects:
+    - openstack/fenix
+    - openstack/puppet-fenix
+    - openstack/python-fenixclient
+  branches:
+    - master
+
 openstack-foxnut:
   events:
     - patchset-created
@@ -2177,6 +2189,7 @@ puppet-openstack:
     - openstack/puppet-congress
     - openstack/puppet-designate
     - openstack/puppet-ec2api
+    - openstack/puppet-fenix
     - openstack/puppet-freezer
     - openstack/puppet-glance
     - openstack/puppet-glare
diff --git a/zuul/main.yaml b/zuul/main.yaml
index e21bca9476..1e9d0eac99 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -491,6 +491,7 @@
           - openstack/entropy
           - openstack/eslint-config-openstack
           - openstack/faafo
+          - openstack/fenix
           - openstack/fixtures-git
           - openstack/flame
           - openstack/foxnut
@@ -1058,6 +1059,7 @@
           - openstack/puppet-congress
           - openstack/puppet-designate
           - openstack/puppet-ec2api
+          - openstack/puppet-fenix
           - openstack/puppet-freezer
           - openstack/puppet-glance
           - openstack/puppet-glare
@@ -1126,6 +1128,7 @@
           - openstack/python-distilclient
           - openstack/python-don
           - openstack/python-dracclient
+          - openstack/python-fenixclient
           - openstack/python-freezerclient
           - openstack/python-fuelclient
           - openstack/python-ganttclient