diff --git a/gerrit/acls/openstack/etcd3gw.config b/gerrit/acls/openstack/etcd3gw.config
new file mode 100644
index 0000000000..b2a4f72869
--- /dev/null
+++ b/gerrit/acls/openstack/etcd3gw.config
@@ -0,0 +1,31 @@
+[access "refs/heads/*"]
+abandon = group etcd3gw-core
+label-Backport-Candidate = -2..+2 group etcd3gw-core
+label-Backport-Candidate = -1..+1 group Registered Users
+label-Code-Review = -2..+2 group etcd3gw-core
+label-Workflow = -1..+1 group etcd3gw-core
+
+[access "refs/heads/stable/*"]
+abandon = group stable-maint-core
+label-Code-Review = -2..+2 group stable-maint-core
+label-Workflow = -1..+1 group stable-maint-core
+
+[label "Backport-Candidate"]
+copyAllScoresIfNoCodeChange = true
+copyAllScoresOnTrivialRebase = true
+copyMaxScore = true
+copyMinScore = true
+defaultValue = 0
+function = NoBlock
+value = -2 Do Not Backport
+value = -1 Not A Backport Candidate
+value = 0 Backport Review Needed
+value = +1 Proposed Backport
+value = +2 Should Backport
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index 3c3d4532e9..68b3c403ee 100644
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -2932,6 +2932,9 @@
   use-storyboard: true
 - project: openstack/eslint-config-openstack
   description: JavaScript Style Guidelines for OpenStack.
+- project: openstack/etcd3gw
+  description: An etcd3 grpc-gateway v3 API Python client
+  upstream: https://github.com/yoctozepto/etcd3gw
 - project: openstack/faafo
   description: RETIRED, First App Application for OpenStack
   acl-config: /home/gerrit2/acls/openstack/retired.config
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 3afe6f3307..7b8ec69233 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -1061,6 +1061,7 @@ openstack-oslo:
     - openstack/devstack-plugin-kafka
     - openstack/devstack-plugin-pika
     - openstack/devstack-plugin-zmq
+    - openstack/etcd3gw
     - openstack/futurist
     - openstack/openstack-doc-tools
     - openstack/openstackdocstheme
diff --git a/zuul/main.yaml b/zuul/main.yaml
index ad33347fed..71a059c014 100644
--- a/zuul/main.yaml
+++ b/zuul/main.yaml
@@ -458,6 +458,7 @@
           - openstack/election
           - openstack/enterprise-wg
           - openstack/eslint-config-openstack
+          - openstack/etcd3gw
           - openstack/freezer
           - openstack/freezer-api
           - openstack/freezer-dr