diff --git a/alarm/nialarm.yml b/alarm/nialarm.yml
index a507b34..26f88c0 100644
--- a/alarm/nialarm.yml
+++ b/alarm/nialarm.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: 'https://www.ni.com/systemlink'
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /nialarm
 consumes:
   - application/json
diff --git a/asset-management-rule/niapmrule.yml b/asset-management-rule/niapmrule.yml
index afc038a..85ff998 100644
--- a/asset-management-rule/niapmrule.yml
+++ b/asset-management-rule/niapmrule.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: 'https://www.ni.com/systemlink'
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /niapmrule
 consumes:
   - application/json
diff --git a/asset-managment/niapm.yml b/asset-managment/niapm.yml
index a78784d..c438f0a 100644
--- a/asset-managment/niapm.yml
+++ b/asset-managment/niapm.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: 'https://www.ni.com/systemlink'
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /niapm
 x-ni-privilege-application: 'niws.niasset'
 consumes:
diff --git a/auth/niauth.yaml b/auth/niauth.yaml
index c0ea59f..c8681e7 100644
--- a/auth/niauth.yaml
+++ b/auth/niauth.yaml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: https://www.ni.com/systemlink
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /niauth/v1
 consumes:
   - application/json
diff --git a/file/nifile.yml b/file/nifile.yml
index 47cdd03..a1f984c 100644
--- a/file/nifile.yml
+++ b/file/nifile.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: https://www.ni.com/systemlink
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /nifile
 consumes: [application/json]
 produces: [application/json]
diff --git a/message/nimessage.yml b/message/nimessage.yml
index 9fc869a..2e235b9 100644
--- a/message/nimessage.yml
+++ b/message/nimessage.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: 'https://www.ni.com/systemlink'
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /nimessage
 consumes:
   - application/json
diff --git a/ni-notebook-execution/ninbexec.yml b/ni-notebook-execution/ninbexec.yml
index 0840932..6b3a492 100644
--- a/ni-notebook-execution/ninbexec.yml
+++ b/ni-notebook-execution/ninbexec.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: https://www.ni.com/systemlink
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /ninbexec
 x-ni-routing-key: Skyline.NotebookExecution
 consumes: [application/json]
diff --git a/opcclient/niopcclient.yml b/opcclient/niopcclient.yml
index c074412..da8028a 100644
--- a/opcclient/niopcclient.yml
+++ b/opcclient/niopcclient.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: https://www.ni.com/systemlink
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /niopcclient
 x-ni-routing-key: 'Skyline.OpcClient'
 consumes: [application/json]
diff --git a/repo/nirepo.yml b/repo/nirepo.yml
index 9391fac..4dba1fa 100644
--- a/repo/nirepo.yml
+++ b/repo/nirepo.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: https://www.ni.com/systemlink
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: "/nirepo"
 consumes: [application/json]
 produces: [application/json]
diff --git a/service-registry/niserviceregistry.yml b/service-registry/niserviceregistry.yml
index 02753c6..7ca9a71 100644
--- a/service-registry/niserviceregistry.yml
+++ b/service-registry/niserviceregistry.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: 'https://www.ni.com/systemlink'
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /niserviceregistry
 consumes:
   - application/json
@@ -113,4 +115,4 @@ paths:
         200:
           $ref: '#/responses/PrivilegeResponse'
         401:
-          $ref: '#/responses/Unauthorized'
\ No newline at end of file
+          $ref: '#/responses/Unauthorized'
diff --git a/systems-management/nisysmgmt.yml b/systems-management/nisysmgmt.yml
index 46ff42a..f0bd9b5 100644
--- a/systems-management/nisysmgmt.yml
+++ b/systems-management/nisysmgmt.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: https://www.ni.com/systemlink
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: '/nisysmgmt'
 x-ni-routing-key: 'Skyline.Salt'
 consumes: [application/json]
diff --git a/systems-state/nisystemsstate.yml b/systems-state/nisystemsstate.yml
index a23aa68..5052934 100644
--- a/systems-state/nisystemsstate.yml
+++ b/systems-state/nisystemsstate.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: https://www.ni.com/systemlink
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: "/nisystemsstate"
 x-ni-routing-key: 'Skyline.SystemsStateManager'
 x-ni-privilege-application: 'niws.nisysmgmt'
diff --git a/tag-historian/nitaghistorian.yml b/tag-historian/nitaghistorian.yml
index 853f8b8..d2444f2 100644
--- a/tag-historian/nitaghistorian.yml
+++ b/tag-historian/nitaghistorian.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: 'https://www.ni.com/systemlink'
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /nitaghistorian
 consumes:
   - application/json
diff --git a/tag-rule/nitagrule.yml b/tag-rule/nitagrule.yml
index 79691da..a6cae6e 100644
--- a/tag-rule/nitagrule.yml
+++ b/tag-rule/nitagrule.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: 'https://www.ni.com/systemlink'
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /nitagrule
 consumes:
   - application/json
@@ -711,4 +713,4 @@ paths:
         401:
           $ref: '#/responses/Unauthorized'
         default:
-          $ref: '#/responses/Error'
\ No newline at end of file
+          $ref: '#/responses/Error'
diff --git a/tag/nitag.yml b/tag/nitag.yml
index 88a495a..b7b8fd3 100644
--- a/tag/nitag.yml
+++ b/tag/nitag.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: 'https://www.ni.com/systemlink'
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /nitag
 consumes:
   - application/json
diff --git a/tdm-reader/nitdmreader.yml b/tdm-reader/nitdmreader.yml
index e05a05d..521b2cc 100644
--- a/tdm-reader/nitdmreader.yml
+++ b/tdm-reader/nitdmreader.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: 'https://www.ni.com/systemlink'
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /nitdmreader
 consumes:
   - application/json
@@ -757,4 +759,4 @@ paths:
         default:
           description: Error
           schema:
-            $ref: '#/definitions/Error'
\ No newline at end of file
+            $ref: '#/definitions/Error'
diff --git a/test-monitor/nitestmonitor-v1.yml b/test-monitor/nitestmonitor-v1.yml
index 198d7dd..065ec28 100644
--- a/test-monitor/nitestmonitor-v1.yml
+++ b/test-monitor/nitestmonitor-v1.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: 'https://www.ni.com/systemlink'
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /nitestmonitor
 consumes:
   - application/json
diff --git a/test-monitor/nitestmonitor-v2.yml b/test-monitor/nitestmonitor-v2.yml
index 2cfd04d..0eb0e82 100644
--- a/test-monitor/nitestmonitor-v2.yml
+++ b/test-monitor/nitestmonitor-v2.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: 'https://www.ni.com/systemlink'
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /nitestmonitor
 consumes:
   - application/json
diff --git a/user-data/niuserdata.yml b/user-data/niuserdata.yml
index 918af55..cb2a148 100644
--- a/user-data/niuserdata.yml
+++ b/user-data/niuserdata.yml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: https://www.ni.com/systemlink
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /niuserdata
 x-ni-routing-key: Skyline.UserData
 consumes: [application/json]
diff --git a/user/niuser.yaml b/user/niuser.yaml
index cc75f66..1554ef8 100644
--- a/user/niuser.yaml
+++ b/user/niuser.yaml
@@ -6,7 +6,9 @@ info:
   contact:
     name: NI
     url: https://www.ni.com/systemlink
-    email: support@ni.com
+externalDocs:
+  description: Technical Support
+  url: https://ni.com/support
 basePath: /niuser/v1
 consumes:
   - application/json