diff --git a/auth/docker/Dockerfile.client b/auth/docker/Dockerfile.client
index 2ecf6a5..3e61173 100644
--- a/auth/docker/Dockerfile.client
+++ b/auth/docker/Dockerfile.client
@@ -8,6 +8,7 @@
 COPY logs /opt/app/aaf_config/logs
 COPY bin/client.sh /opt/app/aaf_config/bin/agent.sh
 COPY bin/aaf-cadi*full.jar /opt/app/aaf_config/bin/
+COPY bin/aaf-cadi-servlet-sample-*-sample.jar /opt/app/aaf_config/bin/
 COPY cert/*trust*.b64 /opt/app/aaf_config/cert/
 
 ENTRYPOINT ["/bin/bash","/opt/app/aaf_config/bin/agent.sh"]
diff --git a/auth/docker/aaf.sh b/auth/docker/aaf.sh
index 7301c50..2939159 100644
--- a/auth/docker/aaf.sh
+++ b/auth/docker/aaf.sh
@@ -13,6 +13,7 @@
     --env HOSTNAME=${HOSTNAME} \
     --env AAF_ENV=${AAF_ENV} \
     --env AAF_REGISTER_AS=${AAF_REGISTER_AS} \
+    --env AAF_LOCATOR_AS=${AAF_LOCATOR_AS} \
     --env LATITUDE=${LATITUDE} \
     --env LONGITUDE=${LONGITUDE} \
     --env CASS_HOST=${CASS_HOST} \
diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init
index bde88c8..178d66f 100644
--- a/auth/docker/d.props.init
+++ b/auth/docker/d.props.init
@@ -14,6 +14,7 @@
 # AAF Machine info
 AAF_ENV=DEV
 AAF_REGISTER_AS=$HOSTNAME
+AAF_LOCATE_AS=$AAF_REGISTER_AS
 LATITUDE=
 LONGITUDE=
 
diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index 2b6c006..80427ce 100755
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -29,6 +29,7 @@
 $DOCKER tag ${ORG}/${PROJECT}/aaf_config:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_config:${VERSION}
 $DOCKER tag ${ORG}/${PROJECT}/aaf_config:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/latest
 
+cp ../cadi/servlet-sample/target/aaf-cadi-servlet-sample-${VERSION}-sample.jar sample/bin
 # AAF Agent Image (for Clients)
 sed -e 's/${AAF_VERSION}/'${VERSION}'/g' -e 's/${AAF_COMPONENT}/'${AAF_COMPONENT}'/g' docker/Dockerfile.client > sample/Dockerfile
 $DOCKER build -t ${ORG}/${PROJECT}/aaf_agent:${VERSION} sample
@@ -36,7 +37,7 @@
 $DOCKER tag ${ORG}/${PROJECT}/aaf_agent:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_agent:latest
 
 # Clean up 
-rm sample/Dockerfile sample/bin/aaf-cadi-aaf-${VERSION}-full.jar
+rm sample/Dockerfile sample/bin/aaf-cadi-aaf-${VERSION}-full.jar sample/bin/aaf-cadi-servlet-sample-${VERSION}-sample.jar 
 rm -Rf sample/CA
 cd -
 
@@ -52,8 +53,11 @@
 rm aaf_${VERSION}/Dockerfile
 cd -
 
+#######
+# Do all the Containers related to AAF Services
+#######
 if ["$1" == ""]; then
-    AAF_COMPONENTS=$(ls ../aaf_*HOT/bin | grep -v '\.')
+    AAF_COMPONENTS=$(ls ../aaf_${VERSION}/bin | grep -v '\.')
 else
     AAF_COMPONENTS=$1
 fi
@@ -69,6 +73,7 @@
     $DOCKER tag ${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:${VERSION} ${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/aaf_${AAF_COMPONENT}:latest
     rm aaf_${VERSION}/Dockerfile
     cd -
+
 done
 rm ../aaf_${VERSION}/pod/*
 rmdir ../aaf_${VERSION}/pod
diff --git a/auth/docker/drun.sh b/auth/docker/drun.sh
index be6795b..c6914a0 100644
--- a/auth/docker/drun.sh
+++ b/auth/docker/drun.sh
@@ -35,22 +35,22 @@
     case "$AAF_COMPONENT" in
     "service")
         PORTMAP="8100:8100"
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
+        LINKS="--link aaf_cass:cassandra "
         ;;
     "locate")
         PORTMAP="8095:8095"
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
+        LINKS="--link aaf_cass:cassandra "
         ;;
     "oauth")
         PORTMAP="8140:8140"
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
+        LINKS="--link aaf_cass:cassandra "
         ;;
     "gui")
         PORTMAP="8200:8200"
         ;;
     "cm")
         PORTMAP="8150:8150"
-        LINKS="--link aaf_cass:cassandra --add-host=$CASS_HOST"
+        LINKS="--link aaf_cass:cassandra "
         ;;
     "hello")
         PORTMAP="8130:8130"
diff --git a/auth/helm/.gitignore b/auth/helm/.gitignore
index a12eb33..1c5fad9 100644
--- a/auth/helm/.gitignore
+++ b/auth/helm/.gitignore
@@ -1,2 +1,3 @@
 aaf.orig/
 pause/
+aaf.new/
diff --git a/auth/helm/aaf/Chart.yaml b/auth/helm/aaf/Chart.yaml
index b6ba288..323a6e1 100644
--- a/auth/helm/aaf/Chart.yaml
+++ b/auth/helm/aaf/Chart.yaml
@@ -2,4 +2,4 @@
 appVersion: "1.0"
 description: AAF Helm Chart
 name: aaf
-version: 2.1.3-SNAPSHOT
+version: 2.1.4-SNAPSHOT
diff --git a/auth/helm/aaf/templates/aaf-cm.yaml b/auth/helm/aaf/templates/aaf-cm.yaml
index 0940de4..0a4c314 100644
--- a/auth/helm/aaf/templates/aaf-cm.yaml
+++ b/auth/helm/aaf/templates/aaf-cm.yaml
@@ -48,7 +48,7 @@
             - name: AAF_REGISTER_AS
               value: "aaf-cm"
             - name: AAF_LOCATOR_AS
-              value: "aaf-locate"
+              value: "{{ .Values.cadi.aaf_locate_as }}"
             - name: LATITUDE
               value: "{{ .Values.cadi.cadi_latitude }}"
             - name: LONGITUDE
diff --git a/auth/helm/aaf/templates/aaf-fs.yaml b/auth/helm/aaf/templates/aaf-fs.yaml
index 7d59684..22935dc 100644
--- a/auth/helm/aaf/templates/aaf-fs.yaml
+++ b/auth/helm/aaf/templates/aaf-fs.yaml
@@ -48,7 +48,7 @@
             - name: AAF_REGISTER_AS
               value: "aaf-fs"
             - name: AAF_LOCATOR_AS
-              value: "aaf-locate"
+              value: "{{ .Values.cadi.aaf_locate_as }}"
             - name: LATITUDE
               value: "{{ .Values.cadi.cadi_latitude }}"
             - name: LONGITUDE
diff --git a/auth/helm/aaf/templates/aaf-gui.yaml b/auth/helm/aaf/templates/aaf-gui.yaml
index bc2a23d..c5d11d0 100644
--- a/auth/helm/aaf/templates/aaf-gui.yaml
+++ b/auth/helm/aaf/templates/aaf-gui.yaml
@@ -48,7 +48,7 @@
             - name: AAF_REGISTER_AS
               value: "aaf-gui"
             - name: AAF_LOCATOR_AS
-              value: "aaf-locate"
+              value: "{{ .Values.cadi.aaf_locate_as }}"
             - name: LATITUDE
               value: "{{ .Values.cadi.cadi_latitude }}"
             - name: LONGITUDE
diff --git a/auth/helm/aaf/templates/aaf-hello.yaml b/auth/helm/aaf/templates/aaf-hello.yaml
index b11365d..033c912 100644
--- a/auth/helm/aaf/templates/aaf-hello.yaml
+++ b/auth/helm/aaf/templates/aaf-hello.yaml
@@ -48,7 +48,7 @@
             - name: AAF_REGISTER_AS
               value: "aaf-hello"
             - name: AAF_LOCATOR_AS
-              value: "aaf-locate"
+              value: "{{ .Values.cadi.aaf_locate_as }}"
             - name: LATITUDE
               value: "{{ .Values.cadi.cadi_latitude }}"
             - name: LONGITUDE
diff --git a/auth/helm/aaf/templates/aaf-locate.yaml b/auth/helm/aaf/templates/aaf-locate.yaml
index 7f10fbf..58c249e 100644
--- a/auth/helm/aaf/templates/aaf-locate.yaml
+++ b/auth/helm/aaf/templates/aaf-locate.yaml
@@ -48,7 +48,7 @@
             - name: AAF_REGISTER_AS
               value: "aaf-locate"
             - name: AAF_LOCATOR_AS
-              value: "aaf-locate"
+              value: "{{ .Values.cadi.aaf_locate_as }}"
             - name: LATITUDE
               value: "{{ .Values.cadi.cadi_latitude }}"
             - name: LONGITUDE
diff --git a/auth/helm/aaf/templates/aaf-oauth.yaml b/auth/helm/aaf/templates/aaf-oauth.yaml
index a08e86f..0898467 100644
--- a/auth/helm/aaf/templates/aaf-oauth.yaml
+++ b/auth/helm/aaf/templates/aaf-oauth.yaml
@@ -48,7 +48,7 @@
             - name: AAF_REGISTER_AS
               value: "aaf-oauth"
             - name: AAF_LOCATOR_AS
-              value: "aaf-locate"
+              value: "{{ .Values.cadi.aaf_locate_as }}"
             - name: LATITUDE
               value: "{{ .Values.cadi.cadi_latitude }}"
             - name: LONGITUDE
diff --git a/auth/helm/aaf/templates/aaf-service.yaml b/auth/helm/aaf/templates/aaf-service.yaml
index e76f61b..306bd77 100644
--- a/auth/helm/aaf/templates/aaf-service.yaml
+++ b/auth/helm/aaf/templates/aaf-service.yaml
@@ -22,7 +22,7 @@
   labels:
     app: aaf-service
 spec:
-  replicas: 2
+  replicas: 1
   selector:
     matchLabels:
       app: aaf-service
@@ -32,9 +32,11 @@
         app: aaf-service
     spec:
       volumes:
-        # Use this Pod Sharing dir to declare various States of starting
       - name: {{ .Chart.Name }}-config-vol
-        emptyDir: {}
+        persistentVolumeClaim:
+        claimName: {{ .Chart.Name }}-config-pvc
+      #- name: {{ .Chart.Name }}-config-vol
+      #  emptyDir: {}
       initContainers:
         - name: {{ .Chart.Name }}-config-container
           image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
@@ -48,7 +50,7 @@
             - name: AAF_REGISTER_AS
               value: "aaf-service"
             - name: AAF_LOCATOR_AS
-              value: "aaf-locate"
+              value: "{{ .Values.cadi.aaf_locate_as }}"
             - name: LATITUDE
               value: "{{ .Values.cadi.cadi_latitude }}"
             - name: LONGITUDE
diff --git a/auth/helm/aaf/templates/aaf.yaml b/auth/helm/aaf/templates/aaf.yaml
deleted file mode 100644
index c8eb297..0000000
--- a/auth/helm/aaf/templates/aaf.yaml
+++ /dev/null
@@ -1,205 +0,0 @@
-kind: Service
-apiVersion: v1
-metadata:
-  name: aaf
-spec:
-  selector:
-    app: aaf
-  #type: ExternalName
-  #externalName: aaf.osaaf.org
-  externalIPs:
-  - 192.168.99.100
-  ports:
-    - name: aaf-service
-      protocol: TCP
-      port: 8100
-      targetPort: 8100
-    - name: aaf-locate
-      protocol: TCP
-      port: 8095
-      targetPort: 8095
-    - name: aaf-oauth
-      protocol: TCP
-      port: 8140
-      targetPort: 8140
-    - name: aaf-gui
-      protocol: TCP
-      port: 8200
-      targetPort: 8200
-    - name: aaf-cm
-      protocol: TCP
-      port: 8150
-      targetPort: 8150
-    - name: aaf-hello
-      protocol: TCP
-      port: 8130
-      targetPort: 8130
-    - name: aaf-fs
-      protocol: TCP
-      port: 8096
-      targetPort: 8096
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: aaf-svcs
-  labels:
-    app: aaf
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: aaf
-  template:
-    metadata:
-      labels:
-        app: aaf
-    spec:
-      volumes:
-      - name: {{ .Chart.Name }}-config-vol
-        persistentVolumeClaim:
-        claimName: {{ .Chart.Name }}-config-pvc
-      # Use this Pod Sharing dir to declare various States of starting
-      - name: {{ .Chart.Name }}-status-vol
-        persistentVolumeClaim:
-        claimName: {{ .Chart.Name }}-status-pvc
-      initContainers:
-        - name: {{ .Chart.Name }}-config-container
-          image: {{ .Values.image.repository }}onap/aaf/aaf_config:{{ .Values.image.version }}
-          imagePullPolicy: IfNotPresent
-          volumeMounts:
-          - mountPath: "/opt/app/osaaf"
-            name: {{ .Chart.Name }}-config-vol
-          - mountPath: "/opt/app/aaf/status"
-            name: {{ .Chart.Name }}-status-vol
-          env:
-            - name: HOSTNAME
-              value: "{{ .Values.cadi.hostname }}"
-            - name: AAF_ENV
-              value: "{{ .Values.cadi.aaf_env }}"
-            - name: AAF_REGISTER_AS
-              value: "{{ .Values.cadi.aaf_register_as }}"
-            - name: LATITUDE
-              value: "{{ .Values.cadi.cadi_latitude }}"
-            - name: LONGITUDE
-              value: "{{ .Values.cadi.cadi_longitude }}"
-            - name: CASS_HOST
-              value: "aaf-cass"
-      containers:
-###
-### AAF-Service
-###
-      - name: {{ .Chart.Name }}-service
-        image: {{ .Values.image.repository }}onap/aaf/aaf_service:{{ .Values.image.version }}
-        imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_service","sleep","30","/opt/app/aaf/bin/service"]
-        volumeMounts:
-          - mountPath: "/opt/app/osaaf"
-            name: {{ .Chart.Name }}-config-vol
-          - mountPath: "/opt/app/aaf/status"
-            name: {{ .Chart.Name }}-status-vol
-        ports:
-        - name: service
-          protocol: TCP
-          containerPort: 8100
-#          hostPort: 8100
-###
-### AAF-Locate
-###
-      - name: {{ .Chart.Name }}-locate
-        image: {{ .Values.image.repository }}onap/aaf/aaf_locate:{{ .Values.image.version }}
-        imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_locate","aaf_service","/opt/app/aaf/bin/locate"]
-        volumeMounts:
-          - mountPath: "/opt/app/osaaf"
-            name: {{ .Chart.Name }}-config-vol
-          - mountPath: "/opt/app/aaf/status"
-            name: {{ .Chart.Name }}-status-vol
-        ports:
-        - name: locate
-          protocol: TCP
-          containerPort: 8095
-
-###
-### AAF-OAuth
-###
-      - name: {{ .Chart.Name }}-oauth
-        image: {{ .Values.image.repository }}onap/aaf/aaf_oauth:{{ .Values.image.version }}
-        imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_oauth","aaf_locate","/opt/app/aaf/bin/oauth"]
-        volumeMounts:
-          - mountPath: "/opt/app/osaaf"
-            name: {{ .Chart.Name }}-config-vol
-          - mountPath: "/opt/app/aaf/status"
-            name: {{ .Chart.Name }}-status-vol
-        ports:
-        - name: oauth
-          protocol: TCP
-          containerPort: 8096
-###
-### AAF-GUI
-###
-      - name: {{ .Chart.Name }}-gui
-        image: {{ .Values.image.repository }}onap/aaf/aaf_gui:{{ .Values.image.version }}
-        imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_gui","aaf_cm","/opt/app/aaf/bin/gui"]
-        volumeMounts:
-          - mountPath: "/opt/app/osaaf"
-            name: {{ .Chart.Name }}-config-vol
-          - mountPath: "/opt/app/aaf/status"
-            name: {{ .Chart.Name }}-status-vol
-        ports:
-        - name: gui
-          protocol: TCP
-          containerPort: 8200
-###
-### AAF-Certman
-###
-      - name: {{ .Chart.Name }}-cm
-        image: {{ .Values.image.repository }}onap/aaf/aaf_cm:{{ .Values.image.version }}
-        imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_cm","aaf_locate","/opt/app/aaf/bin/cm"]
-        volumeMounts:
-          - mountPath: "/opt/app/osaaf"
-            name: {{ .Chart.Name }}-config-vol
-          - mountPath: "/opt/app/aaf/status"
-            name: {{ .Chart.Name }}-status-vol
-        ports:
-        - name: cm
-          protocol: TCP
-          containerPort: 8150
-
-###
-### AAF-FS
-###
-      - name: {{ .Chart.Name }}-fs
-        image: {{ .Values.image.repository }}onap/aaf/aaf_fs:{{ .Values.image.version }}
-        imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_fs","aaf_locate","/opt/app/aaf/bin/fs"]
-        volumeMounts:
-          - mountPath: "/opt/app/osaaf"
-            name: {{ .Chart.Name }}-config-vol
-          - mountPath: "/opt/app/aaf/status"
-            name: {{ .Chart.Name }}-status-vol
-        ports:
-        - name: fs
-          protocol: TCP
-          containerPort: 8096
-
-###
-### AAF-Hello
-###
-      - name: {{ .Chart.Name }}-hello
-        image: {{ .Values.image.repository }}onap/aaf/aaf_hello:{{ .Values.image.version }}
-        imagePullPolicy: IfNotPresent
-        command: ["/bin/bash","/opt/app/aaf/pod/pod_wait.sh","aaf_hello","aaf_locate","/opt/app/aaf/bin/hello"]
-        volumeMounts:
-          - mountPath: "/opt/app/osaaf"
-            name: {{ .Chart.Name }}-config-vol
-          - mountPath: "/opt/app/aaf/status"
-            name: {{ .Chart.Name }}-status-vol
-        ports:
-        - name: hello
-          protocol: TCP
-          containerPort: 8130
-
diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml
index bee28d5..044ff42 100644
--- a/auth/helm/aaf/values.yaml
+++ b/auth/helm/aaf/values.yaml
@@ -19,6 +19,7 @@
   cadi_longitude: "-72.0"  
   aaf_env: "DEV"
   aaf_register_as: "aaf.onap"
+  aaf_locate_as: "aaf-locate"
 
 persistence:
   mountPath: "/mnt/data/aaf"
@@ -47,7 +48,7 @@
   # When using Docker Repo, add, and include trailing "/"
   # repository: nexus3.onap.org:10003/
   # repository: localhost:5000/
-  version: 2.1.3-SNAPSHOT
+  version: 2.1.4-SNAPSHOT
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh
index 99ed279..a709526 100755
--- a/auth/sample/bin/client.sh
+++ b/auth/sample/bin/client.sh
@@ -208,6 +208,9 @@
             echo "--- agent Tool Comands ---"
             $JAVA -Dcadi_prop_files=$LOCAL/${NS}.props -jar $CONFIG/bin/aaf-cadi-aaf-*-full.jar
             ;;
+        sample)
+            echo "--- run Sample Servlet App ---"
+            $JAVA -Dcadi_prop_files=$LOCAL/${NS}.props -cp $CONFIG/bin/aaf-cadi-aaf-*-full.jar:$CONFIG/bin/aaf-cadi-servlet-sample-*-sample.jar org.onap.aaf.sample.cadi.jetty.JettyStandalone ${NS}.props
         esac
         echo ""
         ;;
diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh
index b6121ea..6b694ad 100644
--- a/auth/sample/bin/service.sh
+++ b/auth/sample/bin/service.sh
@@ -89,7 +89,7 @@
     echo cadi_longitude=${LONGITUDE} >> ${TMP}
     echo cadi_x509_issuers=${CADI_X509_ISSUERS} >> ${TMP}
     echo aaf_register_as=${AAF_REGISTER_AS} >> ${TMP}
-    LOCATOR_AS=${LOCATOR:=AAF_REGISTER_AS}
+    AAF_LOCATOR_AS=${AAF_LOCATOR_AS:=$AAF_REGISTER_AS}
     echo aaf_locate_url=https://${AAF_LOCATOR_AS}:8095 >> ${TMP}
 
     cat $TMP
@@ -101,7 +101,7 @@
 
     # Cassandra Config stuff
     # Default is expect a Cassandra on same Node
-    CASS_HOST=${CASS_HOST:="localhost:127.0.0.1"}
+    CASS_HOST=${CASS_HOST:="aaf_cass"}
     CASS_PASS=$("$JAVA" -jar $CONFIG/bin/aaf-cadi-aaf-*-full.jar cadi digest "${CASSANDRA_PASSWORD:-cassandra}" $LOCAL/org.osaaf.aaf.keyfile)
     CASS_NAME=${CASS_HOST/:*/}
     sed -i.backup -e "s/\\(cassandra.clusters=\\).*/\\1${CASSANDRA_CLUSTERS:=$CASS_HOST}/" \
diff --git a/auth/sample/etc/org.osaaf.aaf.cm.props b/auth/sample/etc/org.osaaf.aaf.cm.props
index 661d8bb..ada807e 100644
--- a/auth/sample/etc/org.osaaf.aaf.cm.props
+++ b/auth/sample/etc/org.osaaf.aaf.cm.props
@@ -4,7 +4,7 @@
 ## Note: Link to CA Properties in "local" dir
 ##
 cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props:/opt/app/osaaf/local/org.osaaf.aaf.cm.ca.props
-aaf_component=AAF_NS.cm:2.1.2
+aaf_component=AAF_NS.cm:2.1.4
 port=8150
 
 #Certman
diff --git a/auth/sample/etc/org.osaaf.aaf.fs.props b/auth/sample/etc/org.osaaf.aaf.fs.props
index d0aac3a..b4f4ae5 100644
--- a/auth/sample/etc/org.osaaf.aaf.fs.props
+++ b/auth/sample/etc/org.osaaf.aaf.fs.props
@@ -3,7 +3,7 @@
 ## AAF Fileserver Properties
 ##
 cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props
-aaf_component=AAF_NS.fs:2.1.2
+aaf_component=AAF_NS.fs:2.1.4
 port=8096
 
 aaf_public_dir=/opt/app/osaaf/public
diff --git a/auth/sample/etc/org.osaaf.aaf.gui.props b/auth/sample/etc/org.osaaf.aaf.gui.props
index 3cff29b..3a23e5e 100644
--- a/auth/sample/etc/org.osaaf.aaf.gui.props
+++ b/auth/sample/etc/org.osaaf.aaf.gui.props
@@ -3,7 +3,7 @@
 ## AAF GUI Properties
 ##
 cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props
-aaf_component=AAF_NS.gui:2.1.2
+aaf_component=AAF_NS.gui:2.1.4
 port=8200
 
 aaf_gui_title=AAF
diff --git a/auth/sample/etc/org.osaaf.aaf.hello.props b/auth/sample/etc/org.osaaf.aaf.hello.props
index db64baf..311aa11 100644
--- a/auth/sample/etc/org.osaaf.aaf.hello.props
+++ b/auth/sample/etc/org.osaaf.aaf.hello.props
@@ -3,6 +3,6 @@
 ## AAF Hello Properties
 ##
 cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props
-aaf_component=AAF_NS.hello:2.1.2
+aaf_component=AAF_NS.hello:2.1.4
 port=8130
 
diff --git a/auth/sample/etc/org.osaaf.aaf.locate.props b/auth/sample/etc/org.osaaf.aaf.locate.props
index 25d6217..4337916 100644
--- a/auth/sample/etc/org.osaaf.aaf.locate.props
+++ b/auth/sample/etc/org.osaaf.aaf.locate.props
@@ -3,6 +3,6 @@
 ## AAF Locator Properties
 ##
 cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props
-aaf_component=AAF_NS.locator:2.1.2
+aaf_component=AAF_NS.locator:2.1.4
 port=8095
 
diff --git a/auth/sample/etc/org.osaaf.aaf.oauth.props b/auth/sample/etc/org.osaaf.aaf.oauth.props
index ac8b9a5..4575646 100644
--- a/auth/sample/etc/org.osaaf.aaf.oauth.props
+++ b/auth/sample/etc/org.osaaf.aaf.oauth.props
@@ -3,6 +3,6 @@
 ## AAF OAuth2 Properties
 ##
 cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props
-aaf_component=AAF_NS.oauth:2.1.2
+aaf_component=AAF_NS.oauth:2.1.4
 port=8140
 
diff --git a/auth/sample/etc/org.osaaf.aaf.service.props b/auth/sample/etc/org.osaaf.aaf.service.props
index ab05098..ef9bf01 100644
--- a/auth/sample/etc/org.osaaf.aaf.service.props
+++ b/auth/sample/etc/org.osaaf.aaf.service.props
@@ -3,6 +3,6 @@
 ## AAF Service Properties
 ##
 cadi_prop_files=/opt/app/osaaf/local/org.osaaf.aaf.props:/opt/app/osaaf/etc/org.osaaf.aaf.log4j.props:/opt/app/osaaf/local/org.osaaf.aaf.cassandra.props:/opt/app/osaaf/etc/org.osaaf.aaf.orgs.props
-aaf_component=AAF_NS.service:2.1.2
+aaf_component=AAF_NS.service:2.1.4
 port=8100
 
diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml
index 0eb2965..2fb8bf6 100644
--- a/cadi/servlet-sample/pom.xml
+++ b/cadi/servlet-sample/pom.xml
@@ -25,19 +25,28 @@
 
 	</dependencies>
 	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>sample</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>src/assemble/servlet_sample.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
 		<pluginManagement>
 			<plugins>
 				<plugin>
-					<inherited>true</inherited>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>3.1</version>
-					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
-					</configuration>
-				</plugin>
-				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<version>2.4</version>
 					<artifactId>maven-jar-plugin</artifactId>
@@ -50,6 +59,16 @@
 						</archive>
 					</configuration>
 				</plugin>
+				<plugin>
+					<inherited>true</inherited>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.1</version>
+					<configuration>
+						<source>1.7</source>
+						<target>1.7</target>
+					</configuration>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>
diff --git a/cadi/servlet-sample/src/assemble/servlet_sample.xml b/cadi/servlet-sample/src/assemble/servlet_sample.xml
new file mode 100644
index 0000000..cd95cd3
--- /dev/null
+++ b/cadi/servlet-sample/src/assemble/servlet_sample.xml
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!--
+ * ============LICENSE_START====================================================
+ * org.onap.aaf
+ * ===========================================================================
+ * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END====================================================
+ *
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+  <id>sample</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <unpack>true</unpack>
+      <includes>
+      	<include>org.onap.aaf.authz:aaf-cadi-servlet-sample</include>
+      	<include>javax.servlet:javax.servlet-api</include>
+      	<include>org.eclipse.jetty:jetty-webapp</include>
+      	<include>org.eclipse.jetty:jetty-http</include>
+      	<include>org.eclipse.jetty:jetty-util</include>
+      	<include>org.eclipse.jetty:jetty-server</include>
+      	<include>org.eclipse.jetty:jetty-servlet</include>
+      	<include>org.eclipse.jetty:jetty-io</include>
+      	<include>org.eclipse.jetty:jetty-security</include>
+      	<!-- Note: expects to include cadi-aaf-full jar already delivered -->
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
\ No newline at end of file
diff --git a/cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/MyServlet.java b/cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/MyServlet.java
similarity index 100%
rename from cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/MyServlet.java
rename to cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/MyServlet.java
diff --git a/cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/Config.java b/cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/Config.java
similarity index 100%
rename from cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/Config.java
rename to cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/Config.java
diff --git a/cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java b/cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java
similarity index 100%
rename from cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java
rename to cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/JettyServletServer.java
diff --git a/cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/JettyStandalone.java b/cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/JettyStandalone.java
similarity index 100%
rename from cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/JettyStandalone.java
rename to cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/JettyStandalone.java
diff --git a/cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/MiniJASPIWrap.java b/cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/MiniJASPIWrap.java
similarity index 100%
rename from cadi/servlet-sample/src/test/java/org/onap/aaf/sample/cadi/jetty/MiniJASPIWrap.java
rename to cadi/servlet-sample/src/main/java/org/onap/aaf/sample/cadi/jetty/MiniJASPIWrap.java
diff --git a/conf/CA/bootstrap.sh b/conf/CA/bootstrap.sh
index 056fb3a..9699e30 100644
--- a/conf/CA/bootstrap.sh
+++ b/conf/CA/bootstrap.sh
@@ -9,7 +9,7 @@
 touch index.txt
 echo "unique_subject = no" > index.txt.attr
 if [ ! -e ./serial ]; then
-  echo $(date +%s) > ./serial
+  echo $(date +%s)_$(shuf -i 0-1000000 -n 1)  > ./serial
 fi
 
 NAME=aaf.bootstrap
diff --git a/conf/CA/san_root.aaf b/conf/CA/san_root.aaf
index ec275a3..43b3b25 100644
--- a/conf/CA/san_root.aaf
+++ b/conf/CA/san_root.aaf
@@ -1 +1 @@
-aaf.osaaf.org aaf.api.simpledemo.onap.org
+aaf.osaaf.org aaf.api.simpledemo.onap.org aaf-service aaf-locate aaf-oauth aaf-gui aaf-cm aaf-fs aaf-hello