diff --git a/aether-roc-umbrella/Chart.yaml b/aether-roc-umbrella/Chart.yaml
index 1f28831..a85dbd8 100644
--- a/aether-roc-umbrella/Chart.yaml
+++ b/aether-roc-umbrella/Chart.yaml
@@ -7,7 +7,7 @@
 description: Aether ROC Umbrella chart to deploy all Aether ROC
 kubeVersion: ">=1.18.0"
 type: application
-version: 1.4.46
+version: 1.4.47
 appVersion: v0.0.0
 keywords:
   - aether
@@ -28,7 +28,7 @@
   - name: config-model-aether-4
     condition: onos-config.models.aether.v4.enabled
     repository: "file://../config-models/aether-4.x"
-    version: 4.0.14
+    version: 4.0.15
   - name: config-model-plproxy
     condition: onos-config.models.plproxy.v1.enabled
     repository: "file://../config-models/plproxy-1.x"
diff --git a/config-models/aether-4.x/Chart.yaml b/config-models/aether-4.x/Chart.yaml
index 784022e..416ac27 100644
--- a/config-models/aether-4.x/Chart.yaml
+++ b/config-models/aether-4.x/Chart.yaml
@@ -4,7 +4,7 @@
 
 apiVersion: v2
 name: config-model-aether-4
-version: 4.0.14
+version: 4.0.15
 kubeVersion: ">=1.18.0"
 appVersion: 4.0.0
 description: Aether config model
diff --git a/config-models/aether-4.x/files/aether-4.0.0.tree b/config-models/aether-4.x/files/aether-4.0.0.tree
index 03213f6..664e53c 100644
--- a/config-models/aether-4.x/files/aether-4.0.0.tree
+++ b/config-models/aether-4.x/files/aether-4.0.0.tree
@@ -23,9 +23,6 @@
         +--rw id                    connectivity-service-id
         +--rw display-name?         string
         +--rw description?          at:description
-        +--rw spgwc-endpoint?       inet:uri
-        +--rw hss-endpoint?         inet:uri
-        +--rw pcrf-endpoint?        inet:uri
         +--rw core-5g-endpoint?     inet:uri
         +--rw acc-prometheus-url?   inet:uri
 
@@ -63,7 +60,7 @@
      +--rw ip-domain* [id]
         +--rw id               ip-domain-id
         +--rw display-name?    string
-        +--rw dnn?             at:dnn
+        +--rw dnn              at:dnn
         +--rw dns-primary?     inet:ip-address
         +--rw dns-secondary?   inet:ip-address
         +--rw subnet           inet:ipv4-prefix
diff --git a/config-models/aether-4.x/files/yang/onf-connectivity-service.yang b/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
index e5aaaff..dfcd8d0 100755
--- a/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
+++ b/config-models/aether-4.x/files/yang/onf-connectivity-service.yang
@@ -12,7 +12,7 @@
 
   organization "Open Networking Foundation.";
   contact "Scott Baker";
-  description 
+  description
     "An Aether Connectivity service is the linkage between the
      ROC and a core that provides connectivity.";
 
@@ -52,24 +52,6 @@
         description "description of this connectivity service";
       }
 
-      // deprecated
-      leaf spgwc-endpoint {
-        type inet:uri;
-        description "url of the spgwc service";
-      }
-
-      // deprecated
-      leaf hss-endpoint {
-        type inet:uri;
-        description "url of the hss service";
-      }
-
-      // deprecated
-      leaf pcrf-endpoint {
-        type inet:uri;
-        description "url of the pcrf service";
-      }
-
       leaf core-5g-endpoint {
         type inet:uri;
         description "url of the 5g core";
diff --git a/config-models/aether-4.x/files/yang/onf-ip-domain.yang b/config-models/aether-4.x/files/yang/onf-ip-domain.yang
index 837647a..fdd8c2b 100755
--- a/config-models/aether-4.x/files/yang/onf-ip-domain.yang
+++ b/config-models/aether-4.x/files/yang/onf-ip-domain.yang
@@ -51,8 +51,9 @@
 
       leaf dnn {
         type at:dnn;
+        mandatory true;
         description "DNN/APN";
-      }      
+      }
 
       leaf dns-primary {
         type inet:ip-address;
@@ -80,7 +81,7 @@
       leaf mtu {
         type at:mtu;
         description "maximum transmission unit";
-      }           
+      }
 
       leaf description {
         type at:description;
@@ -96,7 +97,7 @@
         mandatory true;
         description
           "Link to enterprise that owns this IP-Domain";
-      }         
+      }
     }
-  } 
+  }
 }
diff --git a/config-models/aether-4.x/files/yang/onf-vcs.yang b/config-models/aether-4.x/files/yang/onf-vcs.yang
index a0dbbff..9597f9a 100755
--- a/config-models/aether-4.x/files/yang/onf-vcs.yang
+++ b/config-models/aether-4.x/files/yang/onf-vcs.yang
@@ -11,7 +11,6 @@
   import onf-application{ prefix app; }
   import onf-device-group{ prefix dg; }
   import onf-enterprise{ prefix ent; }
-  import onf-template{ prefix vt; }
   import onf-upf { prefix upf; }
   import onf-site{ prefix st; }