diff --git a/.gitreview b/.gitreview
new file mode 100644
index 0000000..457ec01
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=review.vexxhost.dev
+port=29418
+project=neutron-policy-server.git
+defaultbranch=main
diff --git a/.zuul.yaml b/.zuul.yaml
index d3c42e5..d88b8fc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,16 +2,16 @@
     name: neutron-policy-server-pypi
     data:
       api_token: !encrypted/pkcs1-oaep
-        - eRyk66+lyVIomDFkugHPJSSlTF/WIH1fadNm+DHpIVpz4j50ow2sNJoOivBHRCE68Pc28
-          w+HFbLa+pYuFCX8ErZU6KnlenruA8om8yprMh+gNoe+mFs/QkZF4sYbSTox1QmP23DhXq
-          FhcNUk3rZdb3m0YIMU5Ti5UdmOG2MraNTO99QrZ9Qw8nuvbqcKfJgvEsK2IwB+0ZIBZpG
-          5+mOM7IzVdXyuBQ9BG1Q8ezTB2zGGi3RfD6ImjRzL2iHlJ/aIeh5R4kmzt6e7LEWPAxem
-          qxHfkSCc7nwnPPju9Uk9aL+1wXAaxqkYKCdwlVubgRzCCC301nnr12eBnksZ7/RT3du87
-          MAs+RSpRvXV4vRcxvwBfCN651i5dFCCUG4Gk0HgyuSh+Ud4wyWTpWTG/bXzeM7blt3Vrr
-          sF8hYxJSFXQGYHrpaZANzzlQMbxgbVtijLWwLxMoraR83jSPeNqR4kiR6DzuQQhbnkyz1
-          QqDMPtrIhPUne0J3poPAzGIQlIy3Wz5yElJXLlSUNPTY+YelA4X98l5g+arplok6Jkl3D
-          4F/r0d+xISfYf03+I8xbZPgd8Q43TJPqu0dZLFH5p8IctQvuJ5Os3CQ3ehy8M+VGwmoLC
-          D5bHF2XF/E0LKLehT3T2v1B6weoKJY3C5rGTzekRjJ5UksdJXH3a8l7RVI1uLY=
+        - PZ8K6Lgne8TPgUCEv/CLKALS6h2yODmFEuF8Kr+6E19epIcw2Q6fRj3s6f0CNCJTYXBJl
+          UuPbW0c+ZR85mOL5nehStFYm56GmDzBtJ/aIGfquLKVmEhM4FRpFdmvfHc1olae9XTTgy
+          rzqIQRKY3gdoiQJuSIBqu3k4WMkwifxrfX3BTd9uu0e0LLcOxbb6G4Ap4HUOStuASTwdZ
+          fqAuN7g8z9ZiKw3HQb+QClVynsvn2DQXhZe8Ke+MnUlme5Ho6IyOJkly2R1sMjhXGvR9T
+          YgqMcoGIqcOu9Pgz06LEbxEzdXRGh57A84jG0zzYGO7cXzo+WP4EiXgT6foMnKvdC9Nfx
+          cWrpnwqfmNswBUGtp2FBwZdczSaR0Ri8GCmZihKU7pvxv5H4GtZ6hPeiKzdrtBUuWu7bG
+          xszop5GxkKiEHbwb3yyB+8raCtmJ6+/IhPSNffVJhk3N6exLLKO5SR6vt7aUhi7vlRYTg
+          4ylXSy/BSUukf9udUhE/QNmCKB90tZvBn/dRdyB7wZfgdNVhSys3B1YdF4pTgiZJWZGXY
+          wyGQTKyqOVu25SQuuexJB9rmddmViMPd6a7DakW2YsoiOQ4iApX9Y7gvzmrEuwGniL/Dw
+          9eg4n8rOOfd3VUNAUrxVBrGpI4ZbSXSU215nyhdqu81JsU7zfjG5s+nEOAVtXE=
 
 - job:
     name: neutron-policy-server-build
@@ -28,7 +28,6 @@
         name: pypi_info
 
 - project:
-    merge-mode: squash-merge
     check:
       jobs:
         - neutron-policy-server-build