diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8822b4be9..78cc667f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ This release adds support to OneView Rest API version 600 for the hardware varia
    - SAS Logical Interconnect
    - SAS Logical Interconnect Group
    - Server Hardware
+   - Server Hardware Types
    - Server Profile Template
 
 ## v5.3.0
diff --git a/endpoints-support.md b/endpoints-support.md
index 39f0f433f..8557830f3 100644
--- a/endpoints-support.md
+++ b/endpoints-support.md
@@ -436,10 +436,10 @@ OneviewSDK::Datacenter.find_by(@client, width: 11000).map(&:remove)
 |<sub>/rest/server-hardware/{id}/firmware                                                 | GET      | :heavy_minus_sign:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
 |<sub>/rest/server-hardware/discovery                                                     | POST     | :heavy_minus_sign:   | :heavy_minus_sign:   | :heavy_minus_sign:   | :white_check_mark:   |
 |     **Server Hardware Types**                                                                                                                     |
-|<sub>/rest/server-hardware-types</sub>                                                   | GET      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
-|<sub>/rest/server-hardware-types/{id}</sub>                                              | GET      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
-|<sub>/rest/server-hardware-types/{id}</sub>                                              | PUT      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
-|<sub>/rest/server-hardware-types/{id}</sub>                                              | DELETE   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
+|<sub>/rest/server-hardware-types</sub>                                                   | GET      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
+|<sub>/rest/server-hardware-types/{id}</sub>                                              | GET      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
+|<sub>/rest/server-hardware-types/{id}</sub>                                              | PUT      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
+|<sub>/rest/server-hardware-types/{id}</sub>                                              | DELETE   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |
 |     **Server Profile Templates**                                                                                                                  |
 |<sub>/rest/server-profile-templates</sub>                                                | GET      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:
 |<sub>/rest/server-profile-templates</sub>                                                | POST     | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:
diff --git a/examples/shared_samples/server_hardware_type.rb b/examples/shared_samples/server_hardware_type.rb
index cbed07f74..134c53904 100644
--- a/examples/shared_samples/server_hardware_type.rb
+++ b/examples/shared_samples/server_hardware_type.rb
@@ -14,7 +14,7 @@
 # Example: Actions with a Server Hardware Type
 #
 # Supported APIs:
-# - 200, 300, 500
+# - 200, 300, 500, 600
 
 # Resources that can be created according to parameters:
 # api_version = 200 & variant = any to OneviewSDK::API200::ServerHardwareType
@@ -22,6 +22,8 @@
 # api_version = 300 & variant = Synergy to OneviewSDK::API300::Synergy::ServerHardwareType
 # api_version = 500 & variant = C7000 to OneviewSDK::API500::C7000::ServerHardwareType
 # api_version = 500 & variant = Synergy to OneviewSDK::API500::Synergy::ServerHardwareType
+# api_version = 600 & variant = C7000 to OneviewSDK::API600::C7000::ServerHardwareType
+# api_version = 600 & variant = Synergy to OneviewSDK::API600::Synergy::ServerHardwareType
 
 # Resource Class used in this sample
 shw_type_class = OneviewSDK.resource_named('ServerHardwareType', @client.api_version)
diff --git a/lib/oneview-sdk/resource/api600/c7000/server_hardware_type.rb b/lib/oneview-sdk/resource/api600/c7000/server_hardware_type.rb
index 68aebf4a4..29fb18422 100644
--- a/lib/oneview-sdk/resource/api600/c7000/server_hardware_type.rb
+++ b/lib/oneview-sdk/resource/api600/c7000/server_hardware_type.rb
@@ -9,13 +9,13 @@
 # CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require_relative '../../api300/c7000/server_hardware_type'
+require_relative '../../api500/c7000/server_hardware_type'
 
 module OneviewSDK
   module API600
     module C7000
       # Server hardware type resource implementation for API600 C7000
-      class ServerHardwareType < OneviewSDK::API300::C7000::ServerHardwareType
+      class ServerHardwareType < OneviewSDK::API500::C7000::ServerHardwareType
       end
     end
   end
diff --git a/lib/oneview-sdk/resource/api600/synergy/server_hardware_type.rb b/lib/oneview-sdk/resource/api600/synergy/server_hardware_type.rb
index d37fe0441..5d825ce04 100644
--- a/lib/oneview-sdk/resource/api600/synergy/server_hardware_type.rb
+++ b/lib/oneview-sdk/resource/api600/synergy/server_hardware_type.rb
@@ -9,13 +9,13 @@
 # CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require_relative '../../api300/synergy/server_hardware_type'
+require_relative '../../api500/synergy/server_hardware_type'
 
 module OneviewSDK
   module API600
     module Synergy
       # Server hardware type resource implementation for API600 Synergy
-      class ServerHardwareType < OneviewSDK::API300::Synergy::ServerHardwareType
+      class ServerHardwareType < OneviewSDK::API500::Synergy::ServerHardwareType
       end
     end
   end
diff --git a/spec/integration/resource/api600/c7000/server_hardware_type/create_spec.rb b/spec/integration/resource/api600/c7000/server_hardware_type/create_spec.rb
index 86dd96381..dabccbac8 100644
--- a/spec/integration/resource/api600/c7000/server_hardware_type/create_spec.rb
+++ b/spec/integration/resource/api600/c7000/server_hardware_type/create_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-klass = OneviewSDK::API500::C7000::ServerHardwareType
+klass = OneviewSDK::API600::C7000::ServerHardwareType
 RSpec.describe klass, integration: true, type: CREATE, sequence: seq(klass) do
-  let(:current_client) { $client_500 }
-  let(:server_hardware_class) { OneviewSDK::API500::C7000::ServerHardware }
-  include_examples 'ServerHardwareTypeCreateExample', 'integration api500 context', true
+  let(:current_client) { $client_600 }
+  let(:server_hardware_class) { OneviewSDK::API600::C7000::ServerHardware }
+  include_examples 'ServerHardwareTypeCreateExample', 'integration api600 context', true
 end
diff --git a/spec/integration/resource/api600/c7000/server_hardware_type/delete_spec.rb b/spec/integration/resource/api600/c7000/server_hardware_type/delete_spec.rb
index 763f7d7c4..3a28b2cf1 100644
--- a/spec/integration/resource/api600/c7000/server_hardware_type/delete_spec.rb
+++ b/spec/integration/resource/api600/c7000/server_hardware_type/delete_spec.rb
@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-klass = OneviewSDK::API500::C7000::ServerHardwareType
+klass = OneviewSDK::API600::C7000::ServerHardwareType
 RSpec.describe klass, integration: true, type: DELETE, sequence: rseq(klass) do
-  include_context 'integration api500 context'
-  let(:current_client) { $client_500 }
-  let(:server_hardware) { OneviewSDK::API500::C7000::ServerHardware.find_by(current_client, name: $secrets['server_hardware2_ip']).first }
+  include_context 'integration api600 context'
+  let(:current_client) { $client_600 }
+  let(:server_hardware) { OneviewSDK::API600::C7000::ServerHardware.find_by(current_client, name: $secrets['server_hardware2_ip']).first }
 
-  include_examples 'ServerHardwareTypeDeleteExample', 'integration api500 context', true
+  include_examples 'ServerHardwareTypeDeleteExample', 'integration api600 context', true
 end
diff --git a/spec/integration/resource/api600/c7000/server_hardware_type/update_spec.rb b/spec/integration/resource/api600/c7000/server_hardware_type/update_spec.rb
index 7ea23b390..b59c57d2f 100644
--- a/spec/integration/resource/api600/c7000/server_hardware_type/update_spec.rb
+++ b/spec/integration/resource/api600/c7000/server_hardware_type/update_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-klass = OneviewSDK::API500::C7000::ServerHardwareType
+klass = OneviewSDK::API600::C7000::ServerHardwareType
 RSpec.describe klass, integration: true, type: UPDATE do
-  let(:current_client) { $client_500 }
-  include_examples 'ServerHardwareTypeUpdateExample', 'integration api500 context'
+  let(:current_client) { $client_600 }
+  include_examples 'ServerHardwareTypeUpdateExample', 'integration api600 context'
 end
diff --git a/spec/integration/resource/api600/synergy/server_hardware_type/create_spec.rb b/spec/integration/resource/api600/synergy/server_hardware_type/create_spec.rb
index b578923fb..ba8966a12 100644
--- a/spec/integration/resource/api600/synergy/server_hardware_type/create_spec.rb
+++ b/spec/integration/resource/api600/synergy/server_hardware_type/create_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-klass = OneviewSDK::API500::Synergy::ServerHardwareType
+klass = OneviewSDK::API600::Synergy::ServerHardwareType
 RSpec.describe klass, integration: true, type: CREATE, sequence: seq(klass) do
-  let(:current_client) { $client_500_synergy }
-  include_examples 'ServerHardwareTypeCreateExample', 'integration api500 context'
+  let(:current_client) { $client_600_synergy }
+  include_examples 'ServerHardwareTypeCreateExample', 'integration api600 context'
 end
diff --git a/spec/integration/resource/api600/synergy/server_hardware_type/delete_spec.rb b/spec/integration/resource/api600/synergy/server_hardware_type/delete_spec.rb
index b94a23d44..43b30bc24 100644
--- a/spec/integration/resource/api600/synergy/server_hardware_type/delete_spec.rb
+++ b/spec/integration/resource/api600/synergy/server_hardware_type/delete_spec.rb
@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-klass = OneviewSDK::API500::Synergy::ServerHardwareType
+klass = OneviewSDK::API600::Synergy::ServerHardwareType
 RSpec.describe klass, integration: true, type: DELETE, sequence: rseq(klass) do
-  include_context 'integration api500 context'
-  let(:current_client) { $client_500_synergy }
-  let(:server_hardware) { OneviewSDK::API500::Synergy::ServerHardware.get_all(current_client).first }
+  include_context 'integration api600 context'
+  let(:current_client) { $client_600_synergy }
+  let(:server_hardware) { OneviewSDK::API600::Synergy::ServerHardware.get_all(current_client).first }
 
-  include_examples 'ServerHardwareTypeDeleteExample', 'integration api500 context'
+  include_examples 'ServerHardwareTypeDeleteExample', 'integration api600 context'
 end
diff --git a/spec/integration/resource/api600/synergy/server_hardware_type/update_spec.rb b/spec/integration/resource/api600/synergy/server_hardware_type/update_spec.rb
index 62ee35ab8..6765501eb 100644
--- a/spec/integration/resource/api600/synergy/server_hardware_type/update_spec.rb
+++ b/spec/integration/resource/api600/synergy/server_hardware_type/update_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-klass = OneviewSDK::API500::Synergy::ServerHardwareType
+klass = OneviewSDK::API600::Synergy::ServerHardwareType
 RSpec.describe klass, integration: true, type: UPDATE do
-  let(:current_client) { $client_500_synergy }
-  include_examples 'ServerHardwareTypeUpdateExample', 'integration api500 context'
+  let(:current_client) { $client_600_synergy }
+  include_examples 'ServerHardwareTypeUpdateExample', 'integration api600 context'
 end
diff --git a/spec/unit/resource/api600/c7000/server_hardware_type_spec.rb b/spec/unit/resource/api600/c7000/server_hardware_type_spec.rb
index 9b68e283a..52d95a89d 100644
--- a/spec/unit/resource/api600/c7000/server_hardware_type_spec.rb
+++ b/spec/unit/resource/api600/c7000/server_hardware_type_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-RSpec.describe OneviewSDK::API500::C7000::ServerHardwareType do
+RSpec.describe OneviewSDK::API600::C7000::ServerHardwareType do
   include_context 'shared context'
 
-  it 'inherits from OneviewSDK::API300::C7000::ServerHardwareType' do
-    expect(described_class).to be < OneviewSDK::API300::C7000::ServerHardwareType
+  it 'inherits from OneviewSDK::API500::C7000::ServerHardwareType' do
+    expect(described_class).to be < OneviewSDK::API500::C7000::ServerHardwareType
   end
 end
diff --git a/spec/unit/resource/api600/synergy/server_hardware_type_spec.rb b/spec/unit/resource/api600/synergy/server_hardware_type_spec.rb
index bfdd98a87..0220d1f07 100644
--- a/spec/unit/resource/api600/synergy/server_hardware_type_spec.rb
+++ b/spec/unit/resource/api600/synergy/server_hardware_type_spec.rb
@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-RSpec.describe OneviewSDK::API500::Synergy::ServerHardwareType do
+RSpec.describe OneviewSDK::API600::Synergy::ServerHardwareType do
   include_context 'shared context'
 
-  it 'inherits from OneviewSDK::API300::Synergy::ServerHardwareType' do
-    expect(described_class).to be < OneviewSDK::API300::Synergy::ServerHardwareType
+  it 'inherits from OneviewSDK::API500::Synergy::ServerHardwareType' do
+    expect(described_class).to be < OneviewSDK::API500::Synergy::ServerHardwareType
   end
 end