diff --git a/docs/source/admin/quick_howto/server_capabililty.rst b/docs/source/admin/quick_howto/server_capabililty.rst
index 76ed2e0abd..a2474d5e8c 100644
--- a/docs/source/admin/quick_howto/server_capabililty.rst
+++ b/docs/source/admin/quick_howto/server_capabililty.rst
@@ -42,18 +42,18 @@ Users with the Operations or Admin :term:`Role` can associate one or more server
 
 .. _delivery_service_required_server_capabilities:
 
-Manage delivery service required server capabilities
-====================================================
-Users with the Operations or Admin :term:`Role` can associate one or more required server capabilities with a :term:`Delivery Service` by navigating to a :term:`Delivery Service` via :menuselection:`Services --> Delivery Services` and using the context menu for the :term:`Delivery Services` table and selecting :menuselection:`Manage Required Server Capabilities` or by navigating to :menuselection:`Services --> Delivery Services --> Delivery Service --> More --> Manage Required Server Capabilities`.
+Configure delivery service required server capabilities
+=======================================================
+Users with the DELIVERY-SERVICE:CREATE or DELIVERY-SERVICE:UPDATE permission can associate one or more required server capabilities with a :term:`Delivery Service` by navigating to a :term:`Delivery Service` via :menuselection:`Services --> Delivery Services` and clicking on Required Capabilities checkbox present on Delivery Services form (HTTPS and DNS)`.
 
 Adding a required server capability to a :term:`Delivery Service` will ensure two things:
 
 1. Only :term:`Edge-tier caches` with the required capability can be assigned to the :term:`Delivery Service`
 2. Only :term:`Mid-tier caches` with the required capability will handle requests of the :term:`Delivery Service` (if applicable)
 
-.. figure:: server_capability/ds_server_caps_table.png
+.. figure:: server_capability/ds_required_capability.png
 	:align: center
-	:alt: A screenshot of the Traffic Portal UI depicting an example list of Required Server Capabilities for a Delivery Service
+	:alt: A screenshot of the Traffic Portal UI depicting an example of Required Server Capabilities for a Delivery Service
 
 	Example Required Server Capabilities for a Delivery Service Listing
 
diff --git a/docs/source/admin/quick_howto/server_capability/ds_required_capability.png b/docs/source/admin/quick_howto/server_capability/ds_required_capability.png
new file mode 100644
index 0000000000..8bb12f395f
Binary files /dev/null and b/docs/source/admin/quick_howto/server_capability/ds_required_capability.png differ
diff --git a/docs/source/admin/quick_howto/server_capability/ds_server_caps_table.png b/docs/source/admin/quick_howto/server_capability/ds_server_caps_table.png
deleted file mode 100644
index 834fd1060c..0000000000
Binary files a/docs/source/admin/quick_howto/server_capability/ds_server_caps_table.png and /dev/null differ
diff --git a/traffic_portal/app/src/common/modules/form/_form.scss b/traffic_portal/app/src/common/modules/form/_form.scss
index e6956cc703..d0a48be45f 100644
--- a/traffic_portal/app/src/common/modules/form/_form.scss
+++ b/traffic_portal/app/src/common/modules/form/_form.scss
@@ -113,7 +113,7 @@ button.right-button {
 }
 
 /******* tooltip styling *******/
-form label.has-tooltip {
+form .has-tooltip {
 	text-decoration: underline dotted;
 	position: relative;
 	cursor: help;
@@ -189,7 +189,7 @@ textarea.autosize:read-only {
 }
 
 @media (min-width: 768px) {
-	form label.has-tooltip {
+	form .has-tooltip {
 		div.helptooltip {
 			left: calc(100% - 140px);
 		}
@@ -201,7 +201,7 @@ textarea.autosize:read-only {
 }
 
 @media (max-width: 767px) {
-	form label.has-tooltip {
+	form .has-tooltip {
 		div.helptooltip {
 			left: 0;
 		}
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
index 7b94260d1d..c249d52eb0 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.DNS.tpl.html
@@ -343,11 +343,14 @@ <h3 ng-if="!open()">Previous Value</h3>
                         </div>
                     </div>
                     <div class="form-group" ng-class="{'has-error': hasError(generalConfig.requiredCapabilities), 'has-feedback': hasError(generalConfig.requiredCapabilities)}">
-                        <label class="has-tooltip control-label col-md-2 col-sm-2 col-xs-12" for="capability">Required Capability
+                        <div class="has-tooltip control-label col-md-2 col-sm-2 col-xs-12">
+                            <label for="capability">Required Capability</label>
                             <div class="helptooltip">
-                                <div class="helptext">Required capability(ies) associated with a delivery  service</div>
+                                <div class="helptext">
+                                    Required Server capability(ies) associated with this Delivery Service. <a href="https://traffic-control-cdn.readthedocs.io/en/latest/admin/quick_howto/server_capabililty.html?highlight=Capabilities#configure-delivery-service-required-server-capabilities" target="_blank"> See Required Server Capabilities</a>
+                                </div>
                             </div>
-                        </label>
+                        </div>
                         <div class="col-md-10 col-sm-10 col-xs-12">
                             <div class="checkbox-scroll-container">
                                 <div ng-repeat="capability in requiredCapabilities track by $index">
diff --git a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
index 5a1f7123ff..6a93bccab3 100644
--- a/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
+++ b/traffic_portal/app/src/common/modules/form/deliveryService/form.deliveryService.HTTP.tpl.html
@@ -343,11 +343,14 @@ <h3 ng-if="!open()">Previous Value</h3>
                         </div>
                     </div>
                     <div class="form-group" ng-class="{'has-error': hasError(generalConfig.requiredCapabilities), 'has-feedback': hasError(generalConfig.requiredCapabilities)}">
-                        <label class="has-tooltip control-label col-md-2 col-sm-2 col-xs-12" for="capability">Required Capability
+                        <div class="has-tooltip control-label col-md-2 col-sm-2 col-xs-12">
+                            <label for="capability">Required Capability</label>
                             <div class="helptooltip">
-                                <div class="helptext">Required capability(ies) associated with this Delivery Service</div>
+                                <div class="helptext">
+                                    Required Server capability(ies) associated with this Delivery Service. <a href="https://traffic-control-cdn.readthedocs.io/en/latest/admin/quick_howto/server_capabililty.html?highlight=Capabilities#configure-delivery-service-required-server-capabilities" target="_blank"> See Required Server Capabilities</a>
+                                </div>
                             </div>
-                        </label>
+                        </div>
                         <div class="col-md-10 col-sm-10 col-xs-12">
                             <div class="checkbox-scroll-container">
                                 <div ng-repeat="capability in requiredCapabilities track by $index">
@@ -359,7 +362,7 @@ <h3 ng-if="!open()">Previous Value</h3>
                                         ng-model="selectedCapabilities[capability.name]"
                                         ng-checked="selectedCapabilities[capability.name]"
                                     />
-                                   <a ng-href="/#!/server-capabilities/edit?name={{capability.name}}" target="_blank">{{capability.name}}</a>
+                                    <a ng-href="/#!/server-capabilities/edit?name={{capability.name}}" target="_blank">{{capability.name}}</a>
                                 </div>
                             </div>
                             <aside class="current-value" ng-if="settings.isRequest" ng-show="deliveryService.requiredCapabilities !== dsCurrent.requiredCapabilities">