diff --git a/test-server/ruby-v2-server/local-ruby-sdk b/test-server/ruby-v2-server/local-ruby-sdk
index 8f550866..f04deb72 160000
--- a/test-server/ruby-v2-server/local-ruby-sdk
+++ b/test-server/ruby-v2-server/local-ruby-sdk
@@ -1 +1 @@
-Subproject commit 8f5508662bbb5cdc04be76083244b814b0f2c828
+Subproject commit f04deb7227dca1ad1a193d11f7c57803843a197e
diff --git a/test-server/ruby-v3-server/.duvet/config.toml b/test-server/ruby-v3-server/.duvet/config.toml
index eaea972c..7a34c0ff 100644
--- a/test-server/ruby-v3-server/.duvet/config.toml
+++ b/test-server/ruby-v3-server/.duvet/config.toml
@@ -4,19 +4,25 @@
 pattern = "local-ruby-sdk/gems/aws-sdk-s3/lib/**/*.rb"
 comment-style = { meta = "##=", content = "##%" }
 
+[[source]]
+pattern = "local-ruby-sdk/gems/aws-sdk-s3/spec/**/*.rb"
+comment-style = { meta = "##=", content = "##%" }
+
 # Include required specifications here
 [[specification]]
-source = "../specification/s3-encryption/data-format/content-metadata.md"
+source = "../specification/s3-encryption/client.md"
 [[specification]]
-source = "../specification/s3-encryption/data-format/metadata-strategy.md"
+source = "../specification/s3-encryption/decryption.md"
 [[specification]]
 source = "../specification/s3-encryption/encryption.md"
 [[specification]]
-source = "../specification/s3-encryption/decryption.md"
+source = "../specification/s3-encryption/key-commitment.md"
 [[specification]]
 source = "../specification/s3-encryption/key-derivation.md"
 [[specification]]
-source = "../specification/s3-encryption/key-commitment.md"
+source = "../specification/s3-encryption/data-format/content-metadata.md"
+[[specification]]
+source = "../specification/s3-encryption/data-format/metadata-strategy.md"
 
 
 [report.html]
diff --git a/test-server/ruby-v3-server/lib/client_manager.rb b/test-server/ruby-v3-server/lib/client_manager.rb
index 7c125458..158b4462 100644
--- a/test-server/ruby-v3-server/lib/client_manager.rb
+++ b/test-server/ruby-v3-server/lib/client_manager.rb
@@ -37,9 +37,14 @@ def create_client(config)
           else
             raise "Unsupported commitment_policy " + config['commitmentPolicy']
           end
+        if config['commitmentPolicy'] == 'FORBID_ENCRYPT_ALLOW_DECRYPT' && config['encryptionAlgorithm'].nil?
+          hash[:content_encryption_schema] = :aes_gcm_no_padding
+        end
       end
       if !config['enableLegacyWrappingAlgorithms'].nil? || !config['enableLegacyUnauthenticatedModes'].nil?
-        hash[:legacy_modes] = config['enableLegacyWrappingAlgorithms'] || config['enableLegacyUnauthenticatedModes']
+        legacy_modes = config['enableLegacyWrappingAlgorithms'] || config['enableLegacyUnauthenticatedModes']
+        # Set security profile based on legacy wrapping algorithms setting
+        hash[:security_profile] = legacy_modes ? :v3_and_legacy : :v3
       end
     end
 
diff --git a/test-server/ruby-v3-server/local-ruby-sdk b/test-server/ruby-v3-server/local-ruby-sdk
index 8f550866..f04deb72 160000
--- a/test-server/ruby-v3-server/local-ruby-sdk
+++ b/test-server/ruby-v3-server/local-ruby-sdk
@@ -1 +1 @@
-Subproject commit 8f5508662bbb5cdc04be76083244b814b0f2c828
+Subproject commit f04deb7227dca1ad1a193d11f7c57803843a197e