diff --git a/.gitmodules b/.gitmodules
index a3d3d91c5..5ca3c2118 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,8 +3,8 @@
 	url = https://github.com/google/googletest
 [submodule "submodules/openssl"]
 	path = submodules/openssl
-	url = https://github.com/tatsuhiro-t/openssl.git
-	branch = openssl-quic-draft-24
+	url = https://github.com/akamai/openssl.git
+	branch = master-quic-support
 [submodule "submodules/everest"]
 	path = submodules/everest
 	url = https://github.com/nibanks/everest-dist.git
diff --git a/platform/tls_openssl.c b/platform/tls_openssl.c
index 62d795a11..24f8cd5b3 100644
--- a/platform/tls_openssl.c
+++ b/platform/tls_openssl.c
@@ -957,7 +957,7 @@ QuicTlsClientSecConfigCreate(
             //   passing TLS related config from APP layer to TAL.
             //
 
-            Ret =
+            /*Ret =
                 SSL_CTX_load_verify_locations(
                     SecurityConfig->SSLCtx,
                     QuicOpenSslClientTrustedCert,
@@ -966,7 +966,7 @@ QuicTlsClientSecConfigCreate(
                 QuicTraceLogError("[ tls] SSL_CTX_load_verify_locations failed, error: %ld", ERR_get_error());
                 Status = QUIC_STATUS_TLS_ERROR;
                 goto Exit;
-            }
+            }*/
         }
     }
 
@@ -1157,7 +1157,7 @@ QuicTlsInitialize(
 
     if (Config->IsServer) {
         SSL_set_accept_state(TlsContext->Ssl);
-        SSL_set_quic_early_data_enabled(TlsContext->Ssl, 1);
+        //SSL_set_quic_early_data_enabled(TlsContext->Ssl, 1);
     } else {
         SSL_set_connect_state(TlsContext->Ssl);
         SSL_set_tlsext_host_name(TlsContext->Ssl, TlsContext->SNI);
diff --git a/submodules/googletest b/submodules/googletest
index 0a0348082..306f3754a 160000
--- a/submodules/googletest
+++ b/submodules/googletest
@@ -1 +1 @@
-Subproject commit 0a03480824b4fc7883255dbd2fd8940c9f81e22e
+Subproject commit 306f3754a71d6d1ac644681d3544d06744914228
diff --git a/submodules/openssl b/submodules/openssl
index 0685fe710..663b4dd8a 160000
--- a/submodules/openssl
+++ b/submodules/openssl
@@ -1 +1 @@
-Subproject commit 0685fe7102af597d52f979e7509406d71959093c
+Subproject commit 663b4dd8a13e9bcf7fbde1da2aa2c8c1b6781d16