diff --git a/unit_tests/Nightly_Sanity.py b/unit_tests/Nightly_Sanity.py
index 00388dff7..4795d4d72 100755
--- a/unit_tests/Nightly_Sanity.py
+++ b/unit_tests/Nightly_Sanity.py
@@ -693,7 +693,8 @@ for key in equipment_ids:
         ###########################################################################
 
         ### Create SSID Profiles
-        ssid_template = "templates/ssid_profile_template.json"
+        # TODO:  Make this configurable, put at top.
+        ssid_template = "TipWlan-Cloud-Wifi"
 
         # 5G SSIDs
         try:
@@ -827,7 +828,7 @@ for key in equipment_ids:
             child_profiles.append(twoFourG_eap)
         print(child_profiles)
 
-        name = "Nightly_Sanity_" + fw_model + "_" + today + "_bridge"
+        name = command_line_args.testbed + "-" + fw_model + "_bridge"
 
         try:
             create_ap_profile = cloud.create_or_update_ap_profile(cloudSDK_url, bearer, customer_id,
@@ -1175,7 +1176,7 @@ for key in equipment_ids:
             child_profiles.append(fiveG_eap)
             child_profiles.append(twoFourG_eap)
         print(child_profiles)
-        name = "Nightly_Sanity_" + fw_model + "_" + today + "_nat"
+        name = command_line_args.testbed + "-" + fw_model + "_nat"
         try:
             create_ap_profile = cloud.create_or_update_ap_profile(cloudSDK_url, bearer, customer_id,
                                                                   command_line_args.default_ap_profile, name, child_profiles)
@@ -1505,8 +1506,8 @@ for key in equipment_ids:
             child_profiles.append(fiveG_eap)
             child_profiles.append(twoFourG_eap)
         print(child_profiles)
-        name = "Nightly_Sanity_" + fw_model + "_" + today + "_vlan"
 
+        name = command_line_args.testbed + "-" + fw_model + "_vlan"
         try:
             create_ap_profile = cloud.create_or_update_ap_profile(cloudSDK_url, bearer, customer_id,
                                                                   command_line_args.default_ap_profile, name, child_profiles)
diff --git a/unit_tests/cloudsdk.py b/unit_tests/cloudsdk.py
index 5675f4614..a870c29b7 100755
--- a/unit_tests/cloudsdk.py
+++ b/unit_tests/cloudsdk.py
@@ -397,25 +397,25 @@ class CloudSDK:
         print(response)
         return profile['id']
 
-    def create_ssid_profile(self, cloudSDK_url, bearer, template, name, ssid, passkey, radius, security, mode, vlan, radios):
+    def create_ssid_profile(self, cloudSDK_url, bearer, customer_id, template, name, ssid, passkey, radius, security, mode, vlan, radios):
         print("create-ssid-profile, template: %s"%(template))
-        with open(template, 'r+') as ssid_profile:
-            profile = json.load(ssid_profile)
-            profile['name'] = name
-            profile['details']['ssid'] = ssid
-            profile['details']['keyStr'] = passkey
-            profile['details']['radiusServiceName'] = radius
-            profile['details']['secureMode'] = security
-            profile['details']['forwardMode'] = mode
-            profile['details']['vlanId'] = vlan
-            profile['details']['appliedRadios'] = radios
+        profile = self.get_customer_profile_by_name(cloudSDK_url, bearer, customer_id, template)
+
+        profile['name'] = name
+        profile['details']['ssid'] = ssid
+        profile['details']['keyStr'] = passkey
+        profile['details']['radiusServiceName'] = radius
+        profile['details']['secureMode'] = security
+        profile['details']['forwardMode'] = mode
+        profile['details']['vlanId'] = vlan
+        profile['details']['appliedRadios'] = radios
 
         url = cloudSDK_url + "/portal/profile"
         headers = {
             'Content-Type': 'application/json',
             'Authorization': 'Bearer ' + bearer
         }
-        response = requests.request("POST", url, headers=headers, data=open(template, 'rb'))
+        response = requests.request("POST", url, headers=headers, data=json.dumps(profile))
         ssid_profile = response.json()
         return ssid_profile['id']
 
@@ -425,7 +425,7 @@ class CloudSDK:
         profile = self.get_customer_profile_by_name(cloudSDK_url, bearer, customer_id, name)
         if profile == None:
             # create one then
-            return self.create_ssid_profile(cloudSDK_url, bearer, template, name,
+            return self.create_ssid_profile(cloudSDK_url, bearer, customer_id, template, name,
                                             ssid, passkey, radius, security, mode, vlan, radios)
 
         # Update then.