diff --git a/conf/CA/bootstrap.sh b/conf/CA/bootstrap.sh
index 9699e30..145c22c 100644
--- a/conf/CA/bootstrap.sh
+++ b/conf/CA/bootstrap.sh
@@ -75,6 +75,12 @@
      SANS="$SANS $C.$ROOT"
    done
 done
+
+for C in service locate oauth gui cm hello; do
+   SANS="$SANS aaf-$C"
+   SANS="$SANS aaf-$C.onap"
+done
+
 NUM=1
 for D in $SANS; do
     echo "DNS.$NUM = $D" >> $BOOTSTRAP_SAN
diff --git a/conf/CA/san_root.aaf b/conf/CA/san_root.aaf
index 2d33b31..cd3a3f3 100644
--- a/conf/CA/san_root.aaf
+++ b/conf/CA/san_root.aaf
@@ -1 +1 @@
-aaf.osaaf.org aaf.api.simpledemo.onap.org aaf-service aaf-locate aaf-oauth aaf-gui aaf-cm aaf-fs aaf-hello aaf-service.onap aaf-locate.onap aaf-oauth.onap aaf-gui.onap aaf-cm.onap aaf-fs.onap aaf-hello.onap
+aaf.osaaf.org aaf.api.simpledemo.onap.org