diff --git a/java-orgpolicy/CHANGELOG.md b/java-orgpolicy/CHANGELOG.md
index d070e1bad24a..61aa42e26508 100644
--- a/java-orgpolicy/CHANGELOG.md
+++ b/java-orgpolicy/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [2.3.6](https://github.com/googleapis/java-orgpolicy/compare/v2.3.5...v2.3.6) (2022-10-05)
+
+
+### Dependencies
+
+* Update dependency certifi to v2022.9.24 ([#396](https://github.com/googleapis/java-orgpolicy/issues/396)) ([d581c2f](https://github.com/googleapis/java-orgpolicy/commit/d581c2fdff630a9ebf57e9fb12f25ef2730ec4e3))
+* Update dependency charset-normalizer to v2.1.1 ([#399](https://github.com/googleapis/java-orgpolicy/issues/399)) ([66665eb](https://github.com/googleapis/java-orgpolicy/commit/66665eba67f0c7e2a98845eee0927413e519d765))
+* Update dependency click to v8.1.3 ([#400](https://github.com/googleapis/java-orgpolicy/issues/400)) ([641091e](https://github.com/googleapis/java-orgpolicy/commit/641091e4bec534f0602e9bc89364120a780f2c54))
+* Update dependency com.google.cloud:google-cloud-shared-dependencies to v3.0.4 ([#405](https://github.com/googleapis/java-orgpolicy/issues/405)) ([be0b79d](https://github.com/googleapis/java-orgpolicy/commit/be0b79d245f7808334681537ad511ec169c94aba))
+* Update dependency gcp-releasetool to v1.8.8 ([#397](https://github.com/googleapis/java-orgpolicy/issues/397)) ([908a540](https://github.com/googleapis/java-orgpolicy/commit/908a5407acd2e629399c161f4a611253434d6514))
+* Update dependency google-api-core to v2.10.1 ([#401](https://github.com/googleapis/java-orgpolicy/issues/401)) ([378eb32](https://github.com/googleapis/java-orgpolicy/commit/378eb321abbd6a973ed744cd3a34799be69b720e))
+* Update dependency google-auth to v2.12.0 ([#402](https://github.com/googleapis/java-orgpolicy/issues/402)) ([4cad60a](https://github.com/googleapis/java-orgpolicy/commit/4cad60a207d22645e302f4ec2fca8e626bd45d07))
+* Update dependency google-cloud-storage to v2.5.0 ([#403](https://github.com/googleapis/java-orgpolicy/issues/403)) ([4ed2cff](https://github.com/googleapis/java-orgpolicy/commit/4ed2cff1b577e38acfa137500875656afec631ce))
+* Update dependency googleapis-common-protos to v1.56.4 ([#398](https://github.com/googleapis/java-orgpolicy/issues/398)) ([4c48828](https://github.com/googleapis/java-orgpolicy/commit/4c48828bee407ed6cf6ed2afebb663cab95e3074))
+
 ## [2.3.5](https://github.com/googleapis/java-orgpolicy/compare/v2.3.4...v2.3.5) (2022-09-27)
 
 
diff --git a/java-orgpolicy/google-cloud-orgpolicy-bom/pom.xml b/java-orgpolicy/google-cloud-orgpolicy-bom/pom.xml
index 1a1b6c6a2ac5..44728fbcc98a 100644
--- a/java-orgpolicy/google-cloud-orgpolicy-bom/pom.xml
+++ b/java-orgpolicy/google-cloud-orgpolicy-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-orgpolicy-bom</artifactId>
-  <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
+  <version>2.3.6</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
   <packaging>pom</packaging>
   <parent>
     <groupId>com.google.cloud</groupId>
@@ -53,22 +53,22 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-orgpolicy</artifactId>
-        <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
+        <version>2.3.6</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-orgpolicy-v2</artifactId>
-        <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-orgpolicy-v2:current} -->
+        <version>2.3.6</version><!-- {x-version-update:grpc-google-cloud-orgpolicy-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-orgpolicy-v1</artifactId>
-        <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v1:current} -->
+        <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-orgpolicy-v2</artifactId>
-        <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v2:current} -->
+        <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v2:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/java-orgpolicy/google-cloud-orgpolicy/pom.xml b/java-orgpolicy/google-cloud-orgpolicy/pom.xml
index 8727223f96c7..69189a269b71 100644
--- a/java-orgpolicy/google-cloud-orgpolicy/pom.xml
+++ b/java-orgpolicy/google-cloud-orgpolicy/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-orgpolicy</artifactId>
-  <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
+  <version>2.3.6</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
   <name>Google Cloud Org Policy</name>
   <description>The Org Policy API allows users to configure governance rules on
     their GCP resources across the Cloud Resource Hierarchy.
@@ -11,7 +11,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-orgpolicy-parent</artifactId>
-    <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
+    <version>2.3.6</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-orgpolicy</site.installationModule>
diff --git a/java-orgpolicy/grpc-google-cloud-orgpolicy-v2/pom.xml b/java-orgpolicy/grpc-google-cloud-orgpolicy-v2/pom.xml
index dc9d594c3f9f..6f6327ccf5a2 100644
--- a/java-orgpolicy/grpc-google-cloud-orgpolicy-v2/pom.xml
+++ b/java-orgpolicy/grpc-google-cloud-orgpolicy-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-orgpolicy-v2</artifactId>
-  <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-orgpolicy-v2:current} -->
+  <version>2.3.6</version><!-- {x-version-update:grpc-google-cloud-orgpolicy-v2:current} -->
   <name>grpc-google-cloud-orgpolicy-v2</name>
   <description>GRPC library for grpc-google-cloud-orgpolicy-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-orgpolicy-parent</artifactId>
-    <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
+    <version>2.3.6</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/java-orgpolicy/pom.xml b/java-orgpolicy/pom.xml
index 9afd0f8fe29f..149d8f925f3e 100644
--- a/java-orgpolicy/pom.xml
+++ b/java-orgpolicy/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-orgpolicy-parent</artifactId>
   <packaging>pom</packaging>
-  <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v1:current} -->
+  <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v1:current} -->
   <name>Google Cloud Org Policy Parent</name>
   <url>https://github.com/googleapis/java-orgpolicy</url>
   <description>
@@ -61,22 +61,22 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>google-cloud-orgpolicy</artifactId>
-        <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
+        <version>2.3.6</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-orgpolicy-v1</artifactId>
-        <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v1:current} -->
+        <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v1:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-orgpolicy-v2</artifactId>
-        <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v2:current} -->
+        <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-orgpolicy-v2</artifactId>
-        <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-orgpolicy-v2:current} -->
+        <version>2.3.6</version><!-- {x-version-update:grpc-google-cloud-orgpolicy-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
diff --git a/java-orgpolicy/proto-google-cloud-orgpolicy-v1/pom.xml b/java-orgpolicy/proto-google-cloud-orgpolicy-v1/pom.xml
index 08d66a06dbde..45bf62883441 100644
--- a/java-orgpolicy/proto-google-cloud-orgpolicy-v1/pom.xml
+++ b/java-orgpolicy/proto-google-cloud-orgpolicy-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-orgpolicy-v1</artifactId>
-  <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v1:current} -->
+  <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v1:current} -->
   <name>proto-google-cloud-orgpolicy-v1</name>
   <description>PROTO library for proto-google-cloud-orgpolicy-v1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-orgpolicy-parent</artifactId>
-    <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
+    <version>2.3.6</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/java-orgpolicy/proto-google-cloud-orgpolicy-v2/pom.xml b/java-orgpolicy/proto-google-cloud-orgpolicy-v2/pom.xml
index a15c888c0aaf..286a072f33fa 100644
--- a/java-orgpolicy/proto-google-cloud-orgpolicy-v2/pom.xml
+++ b/java-orgpolicy/proto-google-cloud-orgpolicy-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-orgpolicy-v2</artifactId>
-  <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v2:current} -->
+  <version>2.3.6</version><!-- {x-version-update:proto-google-cloud-orgpolicy-v2:current} -->
   <name>proto-google-cloud-orgpolicy-v2</name>
   <description>PROTO library for proto-google-cloud-orgpolicy-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-orgpolicy-parent</artifactId>
-    <version>2.3.6-SNAPSHOT</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
+    <version>2.3.6</version><!-- {x-version-update:google-cloud-orgpolicy:current} -->
   </parent>
   <dependencies>
     <dependency>
diff --git a/java-orgpolicy/versions.txt b/java-orgpolicy/versions.txt
index 7011cad0c4d2..959fa7746d4d 100644
--- a/java-orgpolicy/versions.txt
+++ b/java-orgpolicy/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-orgpolicy:2.3.5:2.3.6-SNAPSHOT
-grpc-google-cloud-orgpolicy-v2:2.3.5:2.3.6-SNAPSHOT
-proto-google-cloud-orgpolicy-v1:2.3.5:2.3.6-SNAPSHOT
-proto-google-cloud-orgpolicy-v2:2.3.5:2.3.6-SNAPSHOT
+google-cloud-orgpolicy:2.3.6:2.3.6
+grpc-google-cloud-orgpolicy-v2:2.3.6:2.3.6
+proto-google-cloud-orgpolicy-v1:2.3.6:2.3.6
+proto-google-cloud-orgpolicy-v2:2.3.6:2.3.6