diff --git a/.gitmodules b/.gitmodules
index 8163db162..1daf98589 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "aws-encryption-sdk-test-vectors"]
 	path = aws-encryption-sdk-test-vectors
-	url = https://github.com/awslabs/private-aws-encryption-sdk-test-vectors-staging.git
+	url = https://github.com/awslabs/aws-encryption-sdk-test-vectors.git
 [submodule "aws-encryption-sdk-specification"]
 	path = aws-encryption-sdk-specification
-	url = https://github.com/awslabs/private-aws-encryption-sdk-specification-staging.git
+	url = https://github.com/awslabs/aws-encryption-sdk-specification.git
diff --git a/aws-encryption-sdk-specification b/aws-encryption-sdk-specification
index ef3420d0f..c35fbd91b 160000
--- a/aws-encryption-sdk-specification
+++ b/aws-encryption-sdk-specification
@@ -1 +1 @@
-Subproject commit ef3420d0fa8740c4a98f2e9e976d75be185473e4
+Subproject commit c35fbd91b28303d69813119088c44b5006395eb4
diff --git a/aws-encryption-sdk-test-vectors b/aws-encryption-sdk-test-vectors
index 5cb6870e3..b6a6c91e6 160000
--- a/aws-encryption-sdk-test-vectors
+++ b/aws-encryption-sdk-test-vectors
@@ -1 +1 @@
-Subproject commit 5cb6870e3d9e0d7117220c0f0033451818f25e85
+Subproject commit b6a6c91e62cc67f891b5dc3d11b0f047d10baf76
diff --git a/package.json b/package.json
index 4aba4776a..a62cff461 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "duvet-report": "aws-encryption-sdk-specification/util/report.js modules/**/src/**/*.ts modules/**/test/**/*.ts compliance_exceptions/*.ts"
   },
   "config": {
-    "localTestVectors": "aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.3.0-mrks.zip",
+    "localTestVectors": "aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.3.0.zip",
     "encryptManifestList": "https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0003-awses-message-encryption.v1.json",
     "encryptKeyManifest": "https://raw.githubusercontent.com/awslabs/aws-crypto-tools-test-vector-framework/master/features/CANONICAL-GENERATED-MANIFESTS/0002-keys.v1.json",
     "decryptOracle": "https://xi1mwx3ttb.execute-api.us-west-2.amazonaws.com/api/v0/decrypt"