diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04672705e..2fedd37ce 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 6.0.0 (unreleased)
+# 6.0.0
 #### Notes
 Extends support of the SDK to OneView REST API version 2600 (OneView v6.00) and ImageStreamer REST API version 2010 (I3S v6.00).
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index ce313f436..686ddb96a 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -71,9 +71,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'5.6.0'
+version = u'6.0.0'
 # The full version, including alpha/beta/rc tags.
-release = u'5.6.0'
+release = u'6.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/examples/appliance_time_and_locale_configuration.py b/examples/appliance_time_and_locale_configuration.py
index 417c8534e..8e71afb2e 100644
--- a/examples/appliance_time_and_locale_configuration.py
+++ b/examples/appliance_time_and_locale_configuration.py
@@ -60,9 +60,16 @@
 time_and_locale = time_and_locales.create(data=time_and_locale)
 print("\n## Created appliance time and locale configurations successfully!")
 pprint(time_and_locale.data)
-# Note: Changing the locale will only be fully effective after resetting the appliance
+# Note: Changing the time and locale will only be fully effective after resetting the appliance.
+# Until then we cannot run the below create function
 
-# Revert the changes made
-time_and_locale = time_and_locales.create(data=options)
-print("\n## Reverted appliance time and locale configurations successfully!")
-pprint(time_and_locale.data)
+'''
+try:
+    # Revert the changes made
+    time_and_locale = time_and_locales.create(data=options)
+    print("\n## Reverted appliance time and locale configurations successfully!")
+    pprint(time_and_locale.data)
+except HPEOneViewTaskError:
+    print("\n## Appliance will be rebooted to make the changes made previously.")
+
+'''
diff --git a/hpeOneView/__init__.py b/hpeOneView/__init__.py
index d346df0cb..530593e37 100644
--- a/hpeOneView/__init__.py
+++ b/hpeOneView/__init__.py
@@ -14,12 +14,12 @@
 standard_library.install_aliases()
 
 __title__ = 'hpeOneView'
-__version__ = '5.6.0'
+__version__ = '6.0.0'
 __copyright__ = '(C) Copyright (2012-2021) Hewlett Packard Enterprise Development LP'
 __license__ = 'Apache'
 
 ###
-# (C) Copyright [2020] Hewlett Packard Enterprise Development LP
+# (C) Copyright [2021] Hewlett Packard Enterprise Development LP
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/setup.py b/setup.py
index b66f8b4a1..312c56abc 100644
--- a/setup.py
+++ b/setup.py
@@ -20,10 +20,10 @@
 from setuptools import setup
 
 setup(name='hpeOneView',
-      version='5.6.0',
+      version='6.0.0',
       description='HPE OneView Python Library',
       url='https://github.com/HewlettPackard/oneview-python',
-      download_url="https://github.com/HewlettPackard/oneview-python/tarball/v5.6.0",
+      download_url="https://github.com/HewlettPackard/oneview-python/tarball/v6.0.0",
       author='Hewlett Packard Enterprise Development LP',
       author_email='oneview-pythonsdk@hpe.com',
       license='Apache',