diff --git a/BUILD.gn b/BUILD.gn
index 5b0677023dd..0e9eb7fc95c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1083,6 +1083,7 @@ config("grpc_config") {
         "include/grpcpp/security/auth_metadata_processor_impl.h",
         "include/grpcpp/security/credentials.h",
         "include/grpcpp/security/server_credentials.h",
+        "include/grpcpp/security/server_credentials_impl.h",
         "include/grpcpp/server.h",
         "include/grpcpp/server_builder.h",
         "include/grpcpp/server_context.h",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50d69f90388..f4da2e83761 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3031,6 +3031,7 @@ foreach(_hdr
   include/grpcpp/security/auth_metadata_processor_impl.h
   include/grpcpp/security/credentials.h
   include/grpcpp/security/server_credentials.h
+  include/grpcpp/security/server_credentials_impl.h
   include/grpcpp/server.h
   include/grpcpp/server_builder.h
   include/grpcpp/server_context.h
@@ -3630,6 +3631,7 @@ foreach(_hdr
   include/grpcpp/security/auth_metadata_processor_impl.h
   include/grpcpp/security/credentials.h
   include/grpcpp/security/server_credentials.h
+  include/grpcpp/security/server_credentials_impl.h
   include/grpcpp/server.h
   include/grpcpp/server_builder.h
   include/grpcpp/server_context.h
@@ -4602,6 +4604,7 @@ foreach(_hdr
   include/grpcpp/security/auth_metadata_processor_impl.h
   include/grpcpp/security/credentials.h
   include/grpcpp/security/server_credentials.h
+  include/grpcpp/security/server_credentials_impl.h
   include/grpcpp/server.h
   include/grpcpp/server_builder.h
   include/grpcpp/server_context.h
diff --git a/Makefile b/Makefile
index 3ecbf182393..c2e57c2556e 100644
--- a/Makefile
+++ b/Makefile
@@ -5362,6 +5362,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpcpp/security/auth_metadata_processor_impl.h \
     include/grpcpp/security/credentials.h \
     include/grpcpp/security/server_credentials.h \
+    include/grpcpp/security/server_credentials_impl.h \
     include/grpcpp/server.h \
     include/grpcpp/server_builder.h \
     include/grpcpp/server_context.h \
@@ -5969,6 +5970,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpcpp/security/auth_metadata_processor_impl.h \
     include/grpcpp/security/credentials.h \
     include/grpcpp/security/server_credentials.h \
+    include/grpcpp/security/server_credentials_impl.h \
     include/grpcpp/server.h \
     include/grpcpp/server_builder.h \
     include/grpcpp/server_context.h \
@@ -6890,6 +6892,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpcpp/security/auth_metadata_processor_impl.h \
     include/grpcpp/security/credentials.h \
     include/grpcpp/security/server_credentials.h \
+    include/grpcpp/security/server_credentials_impl.h \
     include/grpcpp/server.h \
     include/grpcpp/server_builder.h \
     include/grpcpp/server_context.h \
diff --git a/build.yaml b/build.yaml
index d5ce77c2844..0ddb8154669 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1377,6 +1377,7 @@ filegroups:
   - include/grpcpp/security/auth_metadata_processor_impl.h
   - include/grpcpp/security/credentials.h
   - include/grpcpp/security/server_credentials.h
+  - include/grpcpp/security/server_credentials_impl.h
   - include/grpcpp/server.h
   - include/grpcpp/server_builder.h
   - include/grpcpp/server_context.h
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index 602c66b93d9..b52124d0e0f 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -116,6 +116,7 @@ Pod::Spec.new do |s|
                       'include/grpcpp/security/auth_metadata_processor_impl.h',
                       'include/grpcpp/security/credentials.h',
                       'include/grpcpp/security/server_credentials.h',
+                      'include/grpcpp/security/server_credentials_impl.h',
                       'include/grpcpp/server.h',
                       'include/grpcpp/server_builder.h',
                       'include/grpcpp/server_context.h',
diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++
index 7dbb63813c2..f15219dd15e 100644
--- a/tools/doxygen/Doxyfile.c++
+++ b/tools/doxygen/Doxyfile.c++
@@ -1006,6 +1006,7 @@ include/grpcpp/security/auth_metadata_processor.h \
 include/grpcpp/security/auth_metadata_processor_impl.h \
 include/grpcpp/security/credentials.h \
 include/grpcpp/security/server_credentials.h \
+include/grpcpp/security/server_credentials_impl.h \
 include/grpcpp/server.h \
 include/grpcpp/server_builder.h \
 include/grpcpp/server_context.h \
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index c7d29b228ab..c0a9d4c9bcf 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1008,6 +1008,7 @@ include/grpcpp/security/auth_metadata_processor.h \
 include/grpcpp/security/auth_metadata_processor_impl.h \
 include/grpcpp/security/credentials.h \
 include/grpcpp/security/server_credentials.h \
+include/grpcpp/security/server_credentials_impl.h \
 include/grpcpp/server.h \
 include/grpcpp/server_builder.h \
 include/grpcpp/server_context.h \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 7a5d92abdaa..3fd9cc88375 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -10124,6 +10124,7 @@
       "include/grpcpp/security/auth_metadata_processor_impl.h", 
       "include/grpcpp/security/credentials.h", 
       "include/grpcpp/security/server_credentials.h", 
+      "include/grpcpp/security/server_credentials_impl.h", 
       "include/grpcpp/server.h", 
       "include/grpcpp/server_builder.h", 
       "include/grpcpp/server_context.h", 
@@ -10241,6 +10242,7 @@
       "include/grpcpp/security/auth_metadata_processor_impl.h", 
       "include/grpcpp/security/credentials.h", 
       "include/grpcpp/security/server_credentials.h", 
+      "include/grpcpp/security/server_credentials_impl.h", 
       "include/grpcpp/server.h", 
       "include/grpcpp/server_builder.h", 
       "include/grpcpp/server_context.h",