diff --git a/CHANGES b/CHANGES
index 0c6efd2..c9fb957 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,161 @@
 ------------------------------------------------------------------------------
+Release Notes - Apache Knox - Version 1.6.0
+------------------------------------------------------------------------------
+** New Feature
+    * [KNOX-1031] - Apache Hadoop Timeline Server REST API support
+    * [KNOX-1033] - Apache Tez UI support
+    * [KNOX-1641] - Separate <policy> and <dispatch> elements in service.xml controlled by a secure flag
+    * [KNOX-2187] - Add metadata to service definitions
+    * [KNOX-2527] - Support HMAC signature/verification in JWT token authority
+    * [KNOX-2570] - Support for JWKS endpoint
+    * [KNOX-2571] - Knox Homepage Profiles
+    * [KNOX-2579] - Make token passcode secure in DB token state backend
+    * [KNOX-2555] - Add a Token Generation Page for Acquiring JWT Tokens for integration
+    * [KNOX-2624] - Introducing token management page
+
+** Improvement
+    * [KNOX-1080] - Custom dispatch for NiFi should be moved to its own package
+    * [KNOX-1237] - Knox DSL should support HBase Stateless Scanner
+    * [KNOX-1920] - KnoxSSOut for SSO through Proxy with SSOCookieProvider
+    * [KNOX-2095] - Many errors (E.G. 504s) being masked as 500 errors
+    * [KNOX-2252] - Use newly added `context` to calculate the routes in service.xml
+    * [KNOX-2470] - Bump version dependencies November 2020
+    * [KNOX-2530] - Support qualifying service params for CM discovery control
+    * [KNOX-2533] - Qualifying service params for discovery improvements
+    * [KNOX-2539] - Enhance JWTProvider to accept token via HTTP Basic
+    * [KNOX-2542] - Token-based providers should check expiration before verifying tokens
+    * [KNOX-2544] - Token-based providers should cache successful token verifications
+    * [KNOX-2547] - Token-based providers should perform signature verification last
+    * [KNOX-2551] - Token state management improvements
+    * [KNOX-2556] - Enhance JWTProvider to accept knox.id as Passcode Token
+    * [KNOX-2559] - Adding functionality to append headers in Configurable Dispatch
+    * [KNOX-2575] - Add `kid` and `jku` claims to JWT tokens issues by Knox
+    * [KNOX-2594] - Add includeSubDomains to HSTS Support in WebAppSec Provider
+    * [KNOX-2595] - Create KNOX_TOKENS table if not exists
+    * [KNOX-2599] - Improve tokengen UI
+    * [KNOX-2600] - Configure PostgreSQL datasource with JDBC URL
+    * [KNOX-2602] - Add token status in JDBC token state management
+    * [KNOX-2603] - Passcode token verification event should be cached
+    * [KNOX-2613] - The Knox Token Generation UI should validate 'comment' length.
+    * [KNOX-2617] - Copy-to-clipboard icons needed on Token Generation page
+    * [KNOX-2618] - Need to add INFO level eviction logs for debugging
+    * [KNOX-2622] - Support Deflate Encoding for the Inbound Response
+    * [KNOX-2623] - Token generation page improvements
+    * [KNOX-2625] - Enhance KnoxSSO to Support Session Timeout and Logout
+    * [KNOX-2627] - Limiting the number of Knox tokens per user
+    * [KNOX-2653] - Update Atlas Service definition for knox logout/timeout in KNOX-2625
+    * [KNOX-2662] - Show TLS certs on Knox Home page using the token profile
+    * [KNOX-2664] - Users should revoke their own tokens
+    * [KNOX-2667] - Update Ranger Service definition for knox logout/timeout in KNOX-2625
+    * [KNOX-2672] - Handle gateway-level aliases in Hadoop authentication filter
+    * [KNOX-2675] - Oozie Console URL on the web UI should be a Knox URL
+
+** Test
+    * [KNOX-2474] - RemoteConfigurationRegistryJAASConfigTest fails due to invalid auth
+
+** Task
+    * [KNOX-2552] - Add the tokenid to the JSON response payload for KnoxToken service
+    * [KNOX-2553] - Add token management flag in generated JWT tokens
+    * [KNOX-2554] - Implement JDBC TokenStateService
+    * [KNOX-2557] - Add username and comment into token state  metadata
+    * [KNOX-2596] - Change supported DB type for Postgres SQL
+    * [KNOX-2597] - Fallback to AliasBasedTokenStateService in case of DB errors
+    * [KNOX-2598] - Add SSL support to JDBCTokenStateService
+    * [KNOX-2637] - New Knox CLI command to generate a valid JWK secret
+    * [KNOX-2640] - Remove hibernate dependency
+    * [KNOX-2657] - Token generation page improvements
+    * [KNOX-2658] - JDBCTokenStateService is not HA-compatible
+    * [KNOX-2661] - Consolidate HTTP methods in TokenResource
+
+** Bug
+    * [KNOX-755] - retry logic for replayBuffer limit errors is incorrect.
+    * [KNOX-1334] - Knox Service Defs for UIs in AWS EMR Deployments
+    * [KNOX-1361] - Path rewrites for websockets not being handled correctly
+    * [KNOX-1586] - YARN v1 and v2 UI - Handle http vs https for node links
+    * [KNOX-2456] - SHS links sometimes broken on FINISHED jobs page
+    * [KNOX-2475] - url creation failure caused by spaces in url
+    * [KNOX-2476] - Incorrect URLs produced for failover when accessing NiFi UI
+    * [KNOX-2478] - Cleanup HA Dispatch Implementation
+    * [KNOX-2479] - set-cookie headers broken when spaces between attributes are missing
+    * [KNOX-2529] - Update pom versions to 1.6.0-SNAPSHOT
+    * [KNOX-2532] - Unable to set 'None' for the SwitchCase identity provider on the Admin UI.
+    * [KNOX-2538] - JSESSIONID cookie missing when Zeppelin UI proxied via Knox
+    * [KNOX-2541] - Typo in gateway-site.xml
+    * [KNOX-2543] - Intermittent NoHttpResponseException errors
+    * [KNOX-2545] - The new configuration enableStickySession should not loadbalance requests.
+    * [KNOX-2548] - ConcurrentModificationException while verifying JWT token
+    * [KNOX-2549] - Knox CM discovery may lose relevant audit events
+    * [KNOX-2550] - Spark3 UI is missing from Knox Home page
+    * [KNOX-2560] - Add support for KnoxCLI to be able to query/persist alias from remote ZK instance
+    * [KNOX-2562] - TokenStateService getTokenMetadata method should throw UnknownTokenException
+    * [KNOX-2566] - JWT Token Signature Verification Caching NPE
+    * [KNOX-2572] - Unique token identifiers still being logged in entirety
+    * [KNOX-2573] - Service discovery should support HiveServer2 transport mode all
+    * [KNOX-2577] - [Livy Service] Application and container log links should point to YARN UI v2
+    * [KNOX-2578] - TokenResource logging token UUIDs
+    * [KNOX-2582] - Unauthenticated paths support for authentication providers
+    * [KNOX-2601] - ZeppelinUI created multiple sessions when going via Knox
+    * [KNOX-2605] - Knox Token Generation UI should have Validation checks for invalid lifetimes
+    * [KNOX-2606] - Knox Token Generation fails to generate token with lifetime of 1year(365 days)
+    * [KNOX-2608] - JWT tokens issues by Knox should have `kid` and `jku` as part of JOSE Headers 
+    * [KNOX-2616] - Trailing slashes added in service URLs on the Knox Home page
+    * [KNOX-2620] - Signature algorithm mismatch in JWKS resource
+    * [KNOX-2621] - Consolidate HTTP error codes in JWT federation filter
+    * [KNOX-2628] - AliasBasedTokenStateService does not revoke all aliases
+    * [KNOX-2632] - Copy-to-clipboard does not work on Token Generation page with Firefox
+    * [KNOX-2633] - Knox token client data parsing does not handle multiple '=' signs
+    * [KNOX-2634] - ODBC connection broken when HA Loadbalancing config is enabled
+    * [KNOX-2647] -  [Spark History UI Service] Executor logs (stdout/stderr) links are broken with JobHostory Service
+    * [KNOX-2666] - Add support for gateway name in rewrite rules
+    * [KNOX-2669] - Account for samesite property in Knox logout
+    * [KNOX-2670] - AliasBasedTokenStateService does not throw UnknownTokenException at revocation time
+    * [KNOX-2671] - From knox homepage clicking logout returns 500 error code
+    * [KNOX-2673] - Clean up cookies after logout
+    * [KNOX-2678] - Expired tokens are not removed from the in-memory cache
+    * [KNOX-2679] - Trim Pac4j entitlements to avoid cookie too large issue.
+
+** Upgrades
+    * [KNOX-2283] - Upgrade curator to 5.1.0 and zookeeper to 3.6.2
+    * [KNOX-2483] - Upgrade hibernate to 5.4.18.Final+
+    * [KNOX-2485] - Upgrade testcontainers to 1.15.1
+    * [KNOX-2486] - Upgrade rest-assured to 4.3.3
+    * [KNOX-2487] - Upgrade json-path to 2.5.0
+    * [KNOX-2488] - Upgrade spring-vault to 2.2.3.RELEASE
+    * [KNOX-2489] - Upgrade netty to 4.1.55.Final
+    * [KNOX-2490] - Upgrade spring to 5.3.2
+    * [KNOX-2491] - Upgrade caffeine to 2.8.8
+    * [KNOX-2492] - Upgrade groovy to 3.0.7
+    * [KNOX-2493] - Upgrade jackson to 2.11.4
+    * [KNOX-2494] - Upgrade httpcore to 4.4.14
+    * [KNOX-2495] - Upgrade httpclient to 4.5.13
+    * [KNOX-2496] - Upgrade junit to 4.13.1
+    * [KNOX-2497] - Upgrade dependency-check-maven to 6.0.3
+    * [KNOX-2498] - Upgrade jacoco-maven-plugin to 0.8.6
+    * [KNOX-2499] - Upgrade asm to 9.0
+    * [KNOX-2500] - Upgrade commons-net to 3.7.2
+    * [KNOX-2501] - Upgrade spotbugs-maven-plugin to 4.1.4
+    * [KNOX-2502] - Upgrade joda-time to 2.10.8
+    * [KNOX-2503] - Upgrade findsecbugs to 1.11.0
+    * [KNOX-2504] - Upgrade bcprov-jdk15on to 1.67
+    * [KNOX-2505] - Upgrade log4j to 2.14.0
+    * [KNOX-2506] - Upgrade protobuf-java to 3.14.0
+    * [KNOX-2507] - Upgrade metrics to 4.1.16
+    * [KNOX-2508] - Upgrade frontend-maven-plugin to 1.11.0
+    * [KNOX-2512] - Upgrade cors-filter to 2.9.1
+    * [KNOX-2513] - Upgrade checkstyle to 8.38
+    * [KNOX-2514] - Upgrade spotbugs to 4.2.0
+    * [KNOX-2516] - Upgrade pac4j to 4.3.0
+    * [KNOX-2518] - Upgrade spring-vault to 2.3.0
+    * [KNOX-2519] - Upgrade eclipselink to 2.7.8
+    * [KNOX-2520] - Upgrade netty to 4.1.56.Final
+    * [KNOX-2521] - Upgrade glassfish jaxb to 2.3.3
+    * [KNOX-2522] - Upgrade hibernate to 5.4.26.Final
+    * [KNOX-2523] - Upgrade java-support to 7.5.2
+    * [KNOX-2524] - Upgrade lang-tag to 1.5
+    * [KNOX-2525] - Upgrade stax2-api to 4.2.1
+
+
+------------------------------------------------------------------------------
 Release Notes - Apache Knox - Version 1.5.0
 ------------------------------------------------------------------------------
 ** New Features
diff --git a/NOTICE b/NOTICE
index 6938a9b..235278b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Knox
-Copyright 2012-2019 The Apache Software Foundation
+Copyright 2012-2021 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/build.xml b/build.xml
index 7890714..efb1f45 100644
--- a/build.xml
+++ b/build.xml
@@ -25,8 +25,8 @@
 <property name="gateway-project" value="knox"/>
 <property name="gateway-artifact" value="knox"/>
 <property name="knoxshell-artifact" value="knoxshell"/>
-<property name="gateway-version" value="1.6.0-SNAPSHOT"/>
-<property name="release-manager" value="kminder"/>
+<property name="gateway-version" value="1.6.0"/>
+<property name="release-manager" value="smolnar"/>
 
 <property name="gateway-home" value="${gateway-artifact}-${gateway-version}"/>
 
diff --git a/gateway-adapter/pom.xml b/gateway-adapter/pom.xml
index e984ba8..7bf7fbc 100644
--- a/gateway-adapter/pom.xml
+++ b/gateway-adapter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-adapter</artifactId>
diff --git a/gateway-admin-ui/pom.xml b/gateway-admin-ui/pom.xml
index 66bcb32..65dbb37 100644
--- a/gateway-admin-ui/pom.xml
+++ b/gateway-admin-ui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-admin-ui</artifactId>
diff --git a/gateway-applications/pom.xml b/gateway-applications/pom.xml
index 4180471..afdebc6 100644
--- a/gateway-applications/pom.xml
+++ b/gateway-applications/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-applications</artifactId>
diff --git a/gateway-demo-ldap-launcher/pom.xml b/gateway-demo-ldap-launcher/pom.xml
index 611cbcd..bcfcb28 100644
--- a/gateway-demo-ldap-launcher/pom.xml
+++ b/gateway-demo-ldap-launcher/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <artifactId>gateway-demo-ldap-launcher</artifactId>
     <name>gateway-demo-ldap-launcher</name>
diff --git a/gateway-demo-ldap/pom.xml b/gateway-demo-ldap/pom.xml
index 3f009d1..e5cb6f9 100644
--- a/gateway-demo-ldap/pom.xml
+++ b/gateway-demo-ldap/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-demo-ldap</artifactId>
diff --git a/gateway-discovery-ambari/pom.xml b/gateway-discovery-ambari/pom.xml
index 06aaa00..b3d4209 100644
--- a/gateway-discovery-ambari/pom.xml
+++ b/gateway-discovery-ambari/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-discovery-ambari</artifactId>
diff --git a/gateway-discovery-cm/pom.xml b/gateway-discovery-cm/pom.xml
index 0d04bb3..857933f 100644
--- a/gateway-discovery-cm/pom.xml
+++ b/gateway-discovery-cm/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/gateway-docker/pom.xml b/gateway-docker/pom.xml
index 65f008b..7df2d50 100644
--- a/gateway-docker/pom.xml
+++ b/gateway-docker/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <artifactId>gateway-docker</artifactId>
 
diff --git a/gateway-i18n-logging-log4j/pom.xml b/gateway-i18n-logging-log4j/pom.xml
index 29869c2..b2643c5 100644
--- a/gateway-i18n-logging-log4j/pom.xml
+++ b/gateway-i18n-logging-log4j/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-i18n-logging-log4j</artifactId>
diff --git a/gateway-i18n-logging-sl4j/pom.xml b/gateway-i18n-logging-sl4j/pom.xml
index d9f4caf..283cc67 100644
--- a/gateway-i18n-logging-sl4j/pom.xml
+++ b/gateway-i18n-logging-sl4j/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-i18n-logging-sl4j</artifactId>
diff --git a/gateway-i18n/pom.xml b/gateway-i18n/pom.xml
index 7dc260f..9406cb7 100644
--- a/gateway-i18n/pom.xml
+++ b/gateway-i18n/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     
     <artifactId>gateway-i18n</artifactId>
diff --git a/gateway-openapi-ui/pom.xml b/gateway-openapi-ui/pom.xml
index 03c8196..4ad7f4a 100644
--- a/gateway-openapi-ui/pom.xml
+++ b/gateway-openapi-ui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-openapi-ui</artifactId>
diff --git a/gateway-performance-test/pom.xml b/gateway-performance-test/pom.xml
index 2c99e69..96a18c6 100644
--- a/gateway-performance-test/pom.xml
+++ b/gateway-performance-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-performance-test</artifactId>
diff --git a/gateway-provider-ha/pom.xml b/gateway-provider-ha/pom.xml
index 29719b5..9259a9c 100644
--- a/gateway-provider-ha/pom.xml
+++ b/gateway-provider-ha/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-ha</artifactId>
diff --git a/gateway-provider-identity-assertion-common/pom.xml b/gateway-provider-identity-assertion-common/pom.xml
index 00cd8fc..4df1050 100644
--- a/gateway-provider-identity-assertion-common/pom.xml
+++ b/gateway-provider-identity-assertion-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-identity-assertion-common</artifactId>
diff --git a/gateway-provider-identity-assertion-concat/pom.xml b/gateway-provider-identity-assertion-concat/pom.xml
index d5f9c33..d6a2726 100644
--- a/gateway-provider-identity-assertion-concat/pom.xml
+++ b/gateway-provider-identity-assertion-concat/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-identity-assertion-concat</artifactId>
diff --git a/gateway-provider-identity-assertion-hadoop-groups/pom.xml b/gateway-provider-identity-assertion-hadoop-groups/pom.xml
index 54c6f15..1f3c295 100644
--- a/gateway-provider-identity-assertion-hadoop-groups/pom.xml
+++ b/gateway-provider-identity-assertion-hadoop-groups/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-identity-assertion-hadoop-groups</artifactId>
diff --git a/gateway-provider-identity-assertion-pseudo/pom.xml b/gateway-provider-identity-assertion-pseudo/pom.xml
index 83f8f59..00a0921 100644
--- a/gateway-provider-identity-assertion-pseudo/pom.xml
+++ b/gateway-provider-identity-assertion-pseudo/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-identity-assertion-pseudo</artifactId>
diff --git a/gateway-provider-identity-assertion-regex/pom.xml b/gateway-provider-identity-assertion-regex/pom.xml
index f75f917..c832f66 100644
--- a/gateway-provider-identity-assertion-regex/pom.xml
+++ b/gateway-provider-identity-assertion-regex/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-identity-assertion-regex</artifactId>
diff --git a/gateway-provider-identity-assertion-switchcase/pom.xml b/gateway-provider-identity-assertion-switchcase/pom.xml
index 1b22e36..dd91a91 100644
--- a/gateway-provider-identity-assertion-switchcase/pom.xml
+++ b/gateway-provider-identity-assertion-switchcase/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-identity-assertion-switchcase</artifactId>
diff --git a/gateway-provider-jersey/pom.xml b/gateway-provider-jersey/pom.xml
index bc1a18d..9c5415b 100644
--- a/gateway-provider-jersey/pom.xml
+++ b/gateway-provider-jersey/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-jersey</artifactId>
diff --git a/gateway-provider-rewrite-common/pom.xml b/gateway-provider-rewrite-common/pom.xml
index 3ed0754..eb61dbd 100644
--- a/gateway-provider-rewrite-common/pom.xml
+++ b/gateway-provider-rewrite-common/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-rewrite-common</artifactId>
diff --git a/gateway-provider-rewrite-func-hostmap-static/pom.xml b/gateway-provider-rewrite-func-hostmap-static/pom.xml
index bba4e19..7752d61 100644
--- a/gateway-provider-rewrite-func-hostmap-static/pom.xml
+++ b/gateway-provider-rewrite-func-hostmap-static/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     
     <artifactId>gateway-provider-rewrite-func-hostmap-static</artifactId>
diff --git a/gateway-provider-rewrite-func-inbound-query-param/pom.xml b/gateway-provider-rewrite-func-inbound-query-param/pom.xml
index 3d21399..eb61c17 100644
--- a/gateway-provider-rewrite-func-inbound-query-param/pom.xml
+++ b/gateway-provider-rewrite-func-inbound-query-param/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <artifactId>gateway-provider-rewrite-func-inbound-query-param</artifactId>
     <name>gateway-provider-rewrite-func-inbound-url</name>
diff --git a/gateway-provider-rewrite-func-service-registry/pom.xml b/gateway-provider-rewrite-func-service-registry/pom.xml
index 0b4b8d6..3fcfb86 100644
--- a/gateway-provider-rewrite-func-service-registry/pom.xml
+++ b/gateway-provider-rewrite-func-service-registry/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-rewrite-func-service-registry</artifactId>
diff --git a/gateway-provider-rewrite-step-encrypt-uri/pom.xml b/gateway-provider-rewrite-step-encrypt-uri/pom.xml
index 3e5e656..68207d2 100644
--- a/gateway-provider-rewrite-step-encrypt-uri/pom.xml
+++ b/gateway-provider-rewrite-step-encrypt-uri/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-rewrite-step-encrypt-uri</artifactId>
diff --git a/gateway-provider-rewrite-step-secure-query/pom.xml b/gateway-provider-rewrite-step-secure-query/pom.xml
index 0ec41ea..294dffd 100644
--- a/gateway-provider-rewrite-step-secure-query/pom.xml
+++ b/gateway-provider-rewrite-step-secure-query/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-rewrite-step-secure-query</artifactId>
diff --git a/gateway-provider-rewrite/pom.xml b/gateway-provider-rewrite/pom.xml
index 0a5ba92..945d480 100644
--- a/gateway-provider-rewrite/pom.xml
+++ b/gateway-provider-rewrite/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-rewrite</artifactId>
diff --git a/gateway-provider-security-authc-anon/pom.xml b/gateway-provider-security-authc-anon/pom.xml
index 50ce6a5..e568fd8 100755
--- a/gateway-provider-security-authc-anon/pom.xml
+++ b/gateway-provider-security-authc-anon/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-security-authc-anon</artifactId>
diff --git a/gateway-provider-security-authz-acls/pom.xml b/gateway-provider-security-authz-acls/pom.xml
index 1160f36..1c742f5 100644
--- a/gateway-provider-security-authz-acls/pom.xml
+++ b/gateway-provider-security-authz-acls/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <artifactId>gateway-provider-security-authz-acls</artifactId>
     <name>gateway-provider-security-authz-acls</name>
diff --git a/gateway-provider-security-authz-composite/pom.xml b/gateway-provider-security-authz-composite/pom.xml
index 2b6440e..5e8a1b6 100644
--- a/gateway-provider-security-authz-composite/pom.xml
+++ b/gateway-provider-security-authz-composite/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <artifactId>gateway-provider-security-authz-composite</artifactId>
     <name>gateway-provider-security-authz-composite</name>
diff --git a/gateway-provider-security-clientcert/pom.xml b/gateway-provider-security-clientcert/pom.xml
index 460ddd6..169cde9 100755
--- a/gateway-provider-security-clientcert/pom.xml
+++ b/gateway-provider-security-clientcert/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-security-clientcert</artifactId>
diff --git a/gateway-provider-security-hadoopauth/pom.xml b/gateway-provider-security-hadoopauth/pom.xml
index 796efcb..b4b536e 100755
--- a/gateway-provider-security-hadoopauth/pom.xml
+++ b/gateway-provider-security-hadoopauth/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     
     <artifactId>gateway-provider-security-hadoopauth</artifactId>
diff --git a/gateway-provider-security-jwt/pom.xml b/gateway-provider-security-jwt/pom.xml
index fb18bc9..c1e5624 100644
--- a/gateway-provider-security-jwt/pom.xml
+++ b/gateway-provider-security-jwt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-security-jwt</artifactId>
diff --git a/gateway-provider-security-pac4j/pom.xml b/gateway-provider-security-pac4j/pom.xml
index bcb604f..e1dbedf 100644
--- a/gateway-provider-security-pac4j/pom.xml
+++ b/gateway-provider-security-pac4j/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-security-pac4j</artifactId>
diff --git a/gateway-provider-security-preauth/pom.xml b/gateway-provider-security-preauth/pom.xml
index b54ba7f..8cbe769 100644
--- a/gateway-provider-security-preauth/pom.xml
+++ b/gateway-provider-security-preauth/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-security-preauth</artifactId>
diff --git a/gateway-provider-security-shiro/pom.xml b/gateway-provider-security-shiro/pom.xml
index 8e66d8e..3065421 100644
--- a/gateway-provider-security-shiro/pom.xml
+++ b/gateway-provider-security-shiro/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-security-shiro</artifactId>
diff --git a/gateway-provider-security-webappsec/pom.xml b/gateway-provider-security-webappsec/pom.xml
index 74b23a3..b6aad6a 100644
--- a/gateway-provider-security-webappsec/pom.xml
+++ b/gateway-provider-security-webappsec/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-provider-security-webappsec</artifactId>
diff --git a/gateway-release-common/pom.xml b/gateway-release-common/pom.xml
index 6a177d4..4ef7177 100644
--- a/gateway-release-common/pom.xml
+++ b/gateway-release-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
   </parent>
 
   <artifactId>gateway-release-common</artifactId>
diff --git a/gateway-release/pom.xml b/gateway-release/pom.xml
index 7ad4df7..c5486cd 100644
--- a/gateway-release/pom.xml
+++ b/gateway-release/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-release</artifactId>
diff --git a/gateway-server-launcher/pom.xml b/gateway-server-launcher/pom.xml
index dc9ca03..56276e6 100644
--- a/gateway-server-launcher/pom.xml
+++ b/gateway-server-launcher/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-server-launcher</artifactId>
diff --git a/gateway-server-xforwarded-filter/pom.xml b/gateway-server-xforwarded-filter/pom.xml
index 9834525..96d62d6 100644
--- a/gateway-server-xforwarded-filter/pom.xml
+++ b/gateway-server-xforwarded-filter/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-server-xforwarded-filter</artifactId>
diff --git a/gateway-server/pom.xml b/gateway-server/pom.xml
index 430a1e2..e342101 100644
--- a/gateway-server/pom.xml
+++ b/gateway-server/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-server</artifactId>
diff --git a/gateway-service-admin/pom.xml b/gateway-service-admin/pom.xml
index b424d83..e8f477a 100644
--- a/gateway-service-admin/pom.xml
+++ b/gateway-service-admin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-admin</artifactId>
diff --git a/gateway-service-as/pom.xml b/gateway-service-as/pom.xml
index 8d84a8f..71e86a2 100644
--- a/gateway-service-as/pom.xml
+++ b/gateway-service-as/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <artifactId>gateway-service-as</artifactId>
 
diff --git a/gateway-service-definitions/pom.xml b/gateway-service-definitions/pom.xml
index aff2550..2576762 100644
--- a/gateway-service-definitions/pom.xml
+++ b/gateway-service-definitions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-definitions</artifactId>
diff --git a/gateway-service-hashicorp-vault/pom.xml b/gateway-service-hashicorp-vault/pom.xml
index 1c33361..226ccc6 100644
--- a/gateway-service-hashicorp-vault/pom.xml
+++ b/gateway-service-hashicorp-vault/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-hashicorp-vault</artifactId>
diff --git a/gateway-service-hbase/pom.xml b/gateway-service-hbase/pom.xml
index 6115222..9776ce9 100644
--- a/gateway-service-hbase/pom.xml
+++ b/gateway-service-hbase/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-hbase</artifactId>
diff --git a/gateway-service-health/pom.xml b/gateway-service-health/pom.xml
index ead67b4..c733981 100644
--- a/gateway-service-health/pom.xml
+++ b/gateway-service-health/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-health</artifactId>
diff --git a/gateway-service-hive/pom.xml b/gateway-service-hive/pom.xml
index 969c0ea..271c019 100644
--- a/gateway-service-hive/pom.xml
+++ b/gateway-service-hive/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-hive</artifactId>
diff --git a/gateway-service-impala/pom.xml b/gateway-service-impala/pom.xml
index 5979210..4e67ba5 100644
--- a/gateway-service-impala/pom.xml
+++ b/gateway-service-impala/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-impala</artifactId>
diff --git a/gateway-service-jkg/pom.xml b/gateway-service-jkg/pom.xml
index 911ca54..4a6a603 100644
--- a/gateway-service-jkg/pom.xml
+++ b/gateway-service-jkg/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-jkg</artifactId>
diff --git a/gateway-service-knoxsso/pom.xml b/gateway-service-knoxsso/pom.xml
index 2deb91d..3826ae2 100644
--- a/gateway-service-knoxsso/pom.xml
+++ b/gateway-service-knoxsso/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-knoxsso</artifactId>
diff --git a/gateway-service-knoxssout/pom.xml b/gateway-service-knoxssout/pom.xml
index 035a5a8..151eab8 100644
--- a/gateway-service-knoxssout/pom.xml
+++ b/gateway-service-knoxssout/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     
     <artifactId>gateway-service-knoxssout</artifactId>
diff --git a/gateway-service-knoxtoken/pom.xml b/gateway-service-knoxtoken/pom.xml
index f74929d..53acc58 100644
--- a/gateway-service-knoxtoken/pom.xml
+++ b/gateway-service-knoxtoken/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-knoxtoken</artifactId>
diff --git a/gateway-service-livy/pom.xml b/gateway-service-livy/pom.xml
index 617e904..8a1e68a 100644
--- a/gateway-service-livy/pom.xml
+++ b/gateway-service-livy/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-livy</artifactId>
diff --git a/gateway-service-metadata/pom.xml b/gateway-service-metadata/pom.xml
index 1bd3ffd..50ec432 100644
--- a/gateway-service-metadata/pom.xml
+++ b/gateway-service-metadata/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-metadata</artifactId>
diff --git a/gateway-service-nifi-registry/pom.xml b/gateway-service-nifi-registry/pom.xml
index 00c5557..fc479df 100644
--- a/gateway-service-nifi-registry/pom.xml
+++ b/gateway-service-nifi-registry/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-nifi-registry</artifactId>
diff --git a/gateway-service-nifi/pom.xml b/gateway-service-nifi/pom.xml
index a83a851..3f17f9d 100644
--- a/gateway-service-nifi/pom.xml
+++ b/gateway-service-nifi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-nifi</artifactId>
diff --git a/gateway-service-remoteconfig/pom.xml b/gateway-service-remoteconfig/pom.xml
index ee73082..6c8add0 100644
--- a/gateway-service-remoteconfig/pom.xml
+++ b/gateway-service-remoteconfig/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-remoteconfig</artifactId>
diff --git a/gateway-service-rm/pom.xml b/gateway-service-rm/pom.xml
index bf15d53..2c6a05b 100644
--- a/gateway-service-rm/pom.xml
+++ b/gateway-service-rm/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-rm</artifactId>
diff --git a/gateway-service-session/pom.xml b/gateway-service-session/pom.xml
index 7386332..901f3f3 100644
--- a/gateway-service-session/pom.xml
+++ b/gateway-service-session/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-session</artifactId>
diff --git a/gateway-service-storm/pom.xml b/gateway-service-storm/pom.xml
index 95cccaf..f1055db 100644
--- a/gateway-service-storm/pom.xml
+++ b/gateway-service-storm/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-storm</artifactId>
diff --git a/gateway-service-test/pom.xml b/gateway-service-test/pom.xml
index a9de6bd..5fb8c05 100644
--- a/gateway-service-test/pom.xml
+++ b/gateway-service-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-test</artifactId>
diff --git a/gateway-service-tgs/pom.xml b/gateway-service-tgs/pom.xml
index 9c3434d..ca046aa 100644
--- a/gateway-service-tgs/pom.xml
+++ b/gateway-service-tgs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-tgs</artifactId>
diff --git a/gateway-service-vault/pom.xml b/gateway-service-vault/pom.xml
index 5dcd983..7a982f9 100644
--- a/gateway-service-vault/pom.xml
+++ b/gateway-service-vault/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     
     <artifactId>gateway-service-vault</artifactId>
diff --git a/gateway-service-webhdfs/pom.xml b/gateway-service-webhdfs/pom.xml
index 56409b8..45938f6 100644
--- a/gateway-service-webhdfs/pom.xml
+++ b/gateway-service-webhdfs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-service-webhdfs</artifactId>
diff --git a/gateway-shell-launcher/pom.xml b/gateway-shell-launcher/pom.xml
index b505b8e..e5ffc63 100644
--- a/gateway-shell-launcher/pom.xml
+++ b/gateway-shell-launcher/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-shell-launcher</artifactId>
diff --git a/gateway-shell-release/pom.xml b/gateway-shell-release/pom.xml
index af4b9fd..68122b0 100644
--- a/gateway-shell-release/pom.xml
+++ b/gateway-shell-release/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-shell-release</artifactId>
diff --git a/gateway-shell-samples/pom.xml b/gateway-shell-samples/pom.xml
index 53855cb..5f42ccd 100644
--- a/gateway-shell-samples/pom.xml
+++ b/gateway-shell-samples/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-shell-samples</artifactId>
diff --git a/gateway-shell/pom.xml b/gateway-shell/pom.xml
index a8c6856..651dcfb 100644
--- a/gateway-shell/pom.xml
+++ b/gateway-shell/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-shell</artifactId>
diff --git a/gateway-spi/pom.xml b/gateway-spi/pom.xml
index 716c92c..4ca4878 100644
--- a/gateway-spi/pom.xml
+++ b/gateway-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-spi</artifactId>
diff --git a/gateway-test-release-utils/pom.xml b/gateway-test-release-utils/pom.xml
index 7221b0f..fe749c2 100644
--- a/gateway-test-release-utils/pom.xml
+++ b/gateway-test-release-utils/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/gateway-test-release/pom.xml b/gateway-test-release/pom.xml
index 0508473..e32478a 100644
--- a/gateway-test-release/pom.xml
+++ b/gateway-test-release/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-test-release</artifactId>
diff --git a/gateway-test-release/webhdfs-kerb-test/pom.xml b/gateway-test-release/webhdfs-kerb-test/pom.xml
index b987f7a..8654b9d 100644
--- a/gateway-test-release/webhdfs-kerb-test/pom.xml
+++ b/gateway-test-release/webhdfs-kerb-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gateway-test-release</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>webhdfs-kerb-test</artifactId>
diff --git a/gateway-test-release/webhdfs-test/pom.xml b/gateway-test-release/webhdfs-test/pom.xml
index 495f5a3..7834c0e 100644
--- a/gateway-test-release/webhdfs-test/pom.xml
+++ b/gateway-test-release/webhdfs-test/pom.xml
@@ -22,12 +22,12 @@
     <parent>
         <artifactId>gateway-test-release</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>webhdfs-test</artifactId>
     <name>webhdfs-test</name>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.6.0</version>
     <description>Tests for WebHDFS integration with Knox</description>
 
     <dependencies>
diff --git a/gateway-test-utils/pom.xml b/gateway-test-utils/pom.xml
index 391f4e4..697f2e9 100644
--- a/gateway-test-utils/pom.xml
+++ b/gateway-test-utils/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-test-utils</artifactId>
diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml
index ffa272a..1e3f1de 100644
--- a/gateway-test/pom.xml
+++ b/gateway-test/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-test</artifactId>
diff --git a/gateway-topology-hadoop-xml/pom.xml b/gateway-topology-hadoop-xml/pom.xml
index c6cfc5a..7778719 100644
--- a/gateway-topology-hadoop-xml/pom.xml
+++ b/gateway-topology-hadoop-xml/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-topology-hadoop-xml</artifactId>
diff --git a/gateway-topology-simple/pom.xml b/gateway-topology-simple/pom.xml
index bb4f57e..29c5fc5 100644
--- a/gateway-topology-simple/pom.xml
+++ b/gateway-topology-simple/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-topology-simple</artifactId>
diff --git a/gateway-util-common/pom.xml b/gateway-util-common/pom.xml
index 015e7a3..eda6a92 100644
--- a/gateway-util-common/pom.xml
+++ b/gateway-util-common/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     
     <artifactId>gateway-util-common</artifactId>
diff --git a/gateway-util-configinjector/pom.xml b/gateway-util-configinjector/pom.xml
index 9e13363..f6467e7 100755
--- a/gateway-util-configinjector/pom.xml
+++ b/gateway-util-configinjector/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <artifactId>gateway-util-configinjector</artifactId>
 
diff --git a/gateway-util-launcher/pom.xml b/gateway-util-launcher/pom.xml
index e1533fe..392e3ac 100644
--- a/gateway-util-launcher/pom.xml
+++ b/gateway-util-launcher/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
     <artifactId>gateway-util-launcher</artifactId>
     <name>gateway-util-launcher</name>
diff --git a/gateway-util-urltemplate/pom.xml b/gateway-util-urltemplate/pom.xml
index f454afd..139fa2d 100644
--- a/gateway-util-urltemplate/pom.xml
+++ b/gateway-util-urltemplate/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>gateway-util-urltemplate</artifactId>
diff --git a/hadoop-examples/pom.xml b/hadoop-examples/pom.xml
index af508fb..1af9139 100644
--- a/hadoop-examples/pom.xml
+++ b/hadoop-examples/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>hadoop-examples</artifactId>
diff --git a/knox-cli-launcher/pom.xml b/knox-cli-launcher/pom.xml
index b248641..7f8f6fe 100644
--- a/knox-cli-launcher/pom.xml
+++ b/knox-cli-launcher/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>gateway</artifactId>
         <groupId>org.apache.knox</groupId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>knox-cli-launcher</artifactId>
diff --git a/knox-homepage-ui/pom.xml b/knox-homepage-ui/pom.xml
index 6b34ee5..f8031de 100644
--- a/knox-homepage-ui/pom.xml
+++ b/knox-homepage-ui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>knox-homepage-ui</artifactId>
diff --git a/knox-token-management-ui/pom.xml b/knox-token-management-ui/pom.xml
index 0d39dd2..98d0a50 100644
--- a/knox-token-management-ui/pom.xml
+++ b/knox-token-management-ui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.knox</groupId>
         <artifactId>gateway</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>1.6.0</version>
     </parent>
 
     <artifactId>knox-token-management-ui</artifactId>
diff --git a/pom.xml b/pom.xml
index af3ea39..06af12c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>org.apache.knox</groupId>
     <artifactId>gateway</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
+    <version>1.6.0</version>
     <packaging>pom</packaging>
 
     <name>gateway</name>