diff --git a/kubernetes-configs/onlab-pod1-qa.conf b/kubernetes-configs/onlab-pod1-qa.conf
index e4739a0..25b2140 100644
--- a/kubernetes-configs/onlab-pod1-qa.conf
+++ b/kubernetes-configs/onlab-pod1-qa.conf
@@ -1,19 +1,19 @@
 apiVersion: v1
+kind: Config
+current-context: admin-cluster.local
+preferences: {}
 clusters:
 - cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1EUXhOakF3TXpJME4xb1hEVEk1TURReE16QXdNekkwTjFvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTFlsCjdpTUl0VGR0RThoSmgxaEtKMGdLekNlSVFBaWRrSW8zTm41Tmo2dGpzTmp1Z2t5d3dYQXZzMG1tM2RRb0RYMjQKQk93K3p0VWg2STBVTk9RbDB2N2lGZDJXUjFFUWYyTXNwRFFsRmZEcWRMeXVZa1hRREpGaFlxVGhLdXNHYUluUgpVNmFUeFhBcTcyVVFvNHhBc01zZTk4KzR4TmN5eFRFYWhYR0lCUnMvUHRqMkVmTE9mL2dvdGloVmRNY0ZWVjVFCmhXd3orQmF6cC9PVy9wRnBnNjJMTmtZZWxZVFB6T0tUQWcvNlhCRllYaisreHNyTWFxYTN4QXR5Z0tuN04xS2MKVnVIam92RUVqaGJzRmxxVndQTGlyY0xCbnFaTHdBZFhsNzNjMEV6Q0N4enUvc0tMK2tWRkxLOU9uaHpPTzZoTwpTNDBiMlhQdTc4VFJONWtCbmRNQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFHMko0YmJsM3JnbFhVSlp5VzBNTEtqaFcrZTgKNS9ETWp2bytZS0hnaG8vYS9vd3lpU2JwNXpGeUdjSm5SWVBEWmFPMFRaVmZXaUs2VjJQOE9vYXgySllmV1FxYgoreldmdlI3d1RvTnYwMUNaYkdVZW1jTVIzSGlqMWczcnRiYjlVTGRqcUovcjhtQitJUVd5dzVmUlhOUjFsRmhiCkthdUtpZDFRUlYyNlRmYytBV0FITzRXV2pnRUlqNG9TdEZNME5URlNNQWRHYmhiNUtkWFNmUjRTV2hqMTlMVmsKQk9BN3R4TTRlay9xdTlKb2JpOVJkSXorNzVVcWx0dzh6bTdxcVhDTGgvQ0x0Z1dFMUZxNHBpcXdBazMzallTTAozaUxxbTlZRjY4ZXdVemZxaVUwc1Y4ajBINlNxeW1peE13WDdWZjQwYW91SHpLTjRUQWtuRGtBWTZ4OD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    server: https://10.90.0.102:6443
-  name: kubernetes
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrVENDQWVHZ0F3SUJBZ0lKQU9nN2xZNis5MU9ITUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGt3TkRNd01qSXhOek0zV2hnUE1qRXhPVEEwTURZeU1qRTNNemRhTUJJeApFREFPQmdOVkJBTU1CMnQxWW1VdFkyRXdnZ0VpTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCCkFRRGF4NTR2T0l1Zm05Q0VmZTM1anY1d1RBZ2RXZWV2MjNOTTJMd3RRaGd4cU9abFNTYWdPbGMwbWs2QXMxYnIKU2F3RU1aa09XVVFGL3g4V0hjWWZpM1JVdmVENEtqNnkvb0E5NE14ZVRoL1NKeXRlTURwd1IzcTRzaVZKM0xpYwo4UEdiZGhZUlJTV05maHk3azNRNmwwbHd0eFhVNmRkaGxDZGxucnNnME1rU0FUVXY1ZFA1YkJBMXlrbkgxZFVnCi9NM0Y0Q2pyL1FjL3dORzRVd3ROa0QrNzBBRmFBZ0N1b0dXaW9rSXFkeEhyYXlMcWJLYVRTMmRud2dDNWsvTkMKd3FUMG8xQUQrUnVTdjMwQjZNQmJsQnZMdTlXUGxtZ0FDblFEZWRiYWFTMmw2TldpSGw5MFJJUnZIMEtiT0hTago1S3E4YXRqYnZmNTIrT2tDeWxXa1VCRmxBZ01CQUFHalVEQk9NQjBHQTFVZERnUVdCQlFhMGdpNkovaXFsRlh5CjhSTzhMbjB4SCt2bzBEQWZCZ05WSFNNRUdEQVdnQlFhMGdpNkovaXFsRlh5OFJPOExuMHhIK3ZvMERBTUJnTlYKSFJNRUJUQURBUUgvTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFDek5kV1c2OEgrQmsvSTFQZVltVnJUdUJmdApjY3JxVEFjbEozeXR0VDN3TjJsM1FGV3pSdXdzcTY1REtneFNPSEtKOHVGUzVTeTdkbGRXSmNVWDJGdmZ6dU9mCjl6cTlmSzlnMHZ3RmgvZHR5V2lpWDlwR0NKWjFabTJFbTJDWUgwN1pWRlNUY3lOTmtnN2k4SmJya3lNMTlYeHoKem5kZmIrdk9HR0lIeHdqL0M3N3h1aS9pdUx6bVpFUkx4bWZ4NVk1eDJiUllmVjM0Uk9zUUFlY1FXZ1AzTStudwptc0lyL0NNTXJWU0JLRGsxVmx3RFVNbzhrcCs2SDBuemp0cWNGYzhhbzNqalM1cjlRVFhNYW1ybUh1RVZWc3IrCkFMK0J6bzZobWR0Wmc5M1BSbE9SQjdmSW1YZUcxbVVVVWorOW5lNDJpOUJKRUtjQ2g4bTN4NTFUSzV2NgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+    server: https://10.90.0.101:6443
+  name: cluster.local
 contexts:
 - context:
-    cluster: kubernetes
-    user: kubernetes-admin
-  name: kubernetes-admin@kubernetes
-current-context: kubernetes-admin@kubernetes
-kind: Config
-preferences: {}
+    cluster: cluster.local
+    user: admin-cluster.local
+  name: admin-cluster.local
 users:
-- name: kubernetes-admin
+- name: admin-cluster.local
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJY1hMV0xDR0dQVmt3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBME1UWXdNRE15TkRkYUZ3MHlNREEwTVRVd01ETXpOVFphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTExMkFaTTU1ZWxtT0VvV1IKNHRRMXJxNHh2aTRDVHMwTk9iL01Mc1JWV1lqSFlQUU9FRmw5UmVzdEw0R3BQK2Q1NVFlcWhWZm9vVFlCM1pydgp0MkllUURseEZ3UlJmWUN6aWlCL3cyeitjWk9TSWp6aEswR1ZiT3czY3BwYzJBZ3ZKRHZGdkc2Ym1YNHB6M1pJCkZYU1k2Q0pKWDBucU9PTGllaFNUbEdYVVpJRkNvdDV4ckQ4ZnFtUjV6R0NSRzZGMVlwOFYrWVFNeVl4a3dPcE8KYUNUbGxXb2VmZlY1VnMra2phNWJSWmY3N2tTamJDUTRlM3lPMkxOdFJNSE9HTmttVEJ1UWNyRk5rUTgrM3pYKwpyYk43c3JURTFGTFB6bWkyL2h2VTZoQmZ1SjhnRVNCdnE5ejkwU3kycXQ2L0dqZW45L3JMR0N2MTlKbHRPRzV0CnJkSFJtd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFFMVpReXJVdTkvdEVNank1U1lIbE9Ec2dFQTk2K1diR21QVwppUC9veUVJRGlaVWhKNGprajJ6T0pFdjJBZ3NEOGc1c0tObmdITlNrZnlyYmhxWW4vRzJabGgvWDNRdkVnM2lNCitxdUNKeEhSWDZvSHJPSmFrc0VwVENGemt2TTlSNGt5QjE3Q2p2bVRnZG92RTJvSDJMZjZDcFV1VGNPVzdPZnIKTFpxcGFJbUV1ZUc1Nk1FZWdCTCtqQXBoSS9WN3JQSHVnTm1mY3g2TzlqbVY3cit4SXZ5OEZrTGtEUGpWTUh6QwppTFhzWjBqSEM4MUhTVFY5OUVBREh1MExMaGNTMlNxNEpRTm1EcVdiTGl6TG9JVy9FNVcwNGxTTnR3TC8zU2hoCmdVdjArTks3YXdBYmoxa3lTaVR2NFZuYUphQTRqeWdRMFhPRTRPb1M3NUVhRUpEUFNWOD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBMTEyQVpNNTVlbG1PRW9XUjR0UTFycTR4dmk0Q1RzME5PYi9NTHNSVldZakhZUFFPCkVGbDlSZXN0TDRHcFArZDU1UWVxaFZmb29UWUIzWnJ2dDJJZVFEbHhGd1JSZllDemlpQi93MnorY1pPU0lqemgKSzBHVmJPdzNjcHBjMkFndkpEdkZ2RzZibVg0cHozWklGWFNZNkNKSlgwbnFPT0xpZWhTVGxHWFVaSUZDb3Q1eApyRDhmcW1SNXpHQ1JHNkYxWXA4VitZUU15WXhrd09wT2FDVGxsV29lZmZWNVZzK2tqYTViUlpmNzdrU2piQ1E0CmUzeU8yTE50Uk1IT0dOa21UQnVRY3JGTmtROCszelgrcmJON3NyVEUxRkxQem1pMi9odlU2aEJmdUo4Z0VTQnYKcTl6OTBTeTJxdDYvR2plbjkvckxHQ3YxOUpsdE9HNXRyZEhSbXdJREFRQUJBb0lCQVFDUjFWVE43aXJBT01oRgpyb0RkRWtuUG9WRTVzTG9MVmpxd2NqbjNLU2VLVzE1M1Bvd1BjaW1zSU5ZV0p6ek9jeFpOaW1WanFlVnkxTGxxCnNESEhBZi91Q1hlVTJHMitDRnFMRy9xb0FMUkRnR1FpSHd0eVdSU3dEengwdENaT2V5eEE0dURBK2owUE1TbHEKdkhPUFk4YnUyZGpKVjZudEgyV3d1U0krQ0w1TDF5VVVBb2tRa25yeDdmajdBNGljbWhIZzJRVFE1MlhPMmtxNwo3NFF1VGN6Z3JXSmpQdVZvL25pdThqb2lnVU0zRUN2WUlLUmN0UFlBbHo5SGkxeGx0UzdSOG9uSC9GN1dTL0RaCjJOZEVCMWwyWVJNUlMyVDA5cEpNa1h2dkJ4bjU4WTcydllRTnljVnpOeFJNWXZzSzBCeU43dWwwUEZLaHA5azUKOVBMSi9QWGhBb0dCQVBrZk1CRFQzcTUyMFNHUE96cmNFVWpGWWh3ejJtUm9kYlV0TWRPK3FkUWRVRGgwTXQ4RQpqRDBJZStsZzFlK1ptTG9EOHBHVjJuYnhzaVVKQ2NSS1dxandreUFWaEJjMVpETVZDUWk3aUwrTkxLcGJJME1CCmVMZWcxcWxOL0dhdngrS2VoRkNCTms3WXNqVXNaSDdnMW12MkpwVmhRYXowMVEySTdqaGo3SHFaQW9HQkFOMVAKdURtVDNCRU1OSWE5WkJRZ3BxVmtjbGxTOVVxMDlyM1k2SFkraXNad2plWkQ1b2FwbWRmaWlpZ0hKSGxiR2UvdgpkQzgybmZWOVJUeS95RGEvNCs4RUdJcHNjSVFSc3NmcTF0LzVXZUVMVnNqdERUbXBPNEJqN2E0MVdDbm1lVmc4ClJ6YnRBak9LR1Qvb2FxM0xhV0lqTXA5bWp6MWVvcFp1VUhscEkrSlRBb0dBYkFBMVdsWS81K3JpNTJXdEMrdDAKSXRSUG9HSnFmN1U1c240UlovYjBzVnl6OW9XSnVGM0VYb0ZiRnVaQVdVdUJoc05IV2c1WlU4K2NwNm12YmtXOQo0QmZMOE5Eakh4eXFmK3JTcTlLQmltbXR2MzBiWUdVMjdJVHlDeHdnSEhTQWQ2SzVRaDJDYWRSUURmVmM3QlNWCllPQ3FBWURVZENNQWFvbStuUHZVL2FFQ2dZRUF2UUxzOEIvYi82TlE2Ukt2ZXBFNFFtRTdXQmFGOER3Rno3YUYKTXhmUEpoUFMzU3A0bytJTnhsZHdieWRLZTJyWENCaVdQZ3lEYzdwOWU1aS93aUs0NU5XMnIrSlZaalpIWG42dQo3YkxrbEZNKzEzTzlxOVZoUUJJWVdJU3V1M3BmZ0lCYXdncEJxd3J5N2FYdUZtaDNwSjB6Q3Zob3RaMHhkeERZCkloa3QwSWtDZ1lBWForU3ZoSCtZS05IYXI4SGNLYjVhZXh1dXJ4Q2RkQlBwanJPdms5MHM5OWYwTjN0WDVQd24KMjF3YTZ5N2VQWC9vQzhMK08rWlRpdlByWHBJMjNhSjF2QWZLZTBxYU1xaUZtSWNVakFKVkFRbXhUUFRuNDZBYgoxZmYyVWMxT05WQzFKRFJEY21vak9mQ2lILzc3TmRBVFpwa2xJT2lPeHB4UTlGQ1lyeEcvR1E9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURvekNDQW91Z0F3SUJBZ0lKQUpsTWFyVzR4N2JLTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0lCY05NVGt3TkRNd01qSXhOek00V2hnUE1qRXhPVEEwTURZeU1qRTNNemhhTURReApHVEFYQmdOVkJBTU1FR3QxWW1VdFlXUnRhVzR0Ym05a1pURXhGekFWQmdOVkJBb01Ebk41YzNSbGJUcHRZWE4wClpYSnpNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXVsVHJ3bm5xMHBDU3pxZFIKRTgySDRqNlBxY1lrVFVDSGZnYUs1T1hYVXgrZlhua0hpSkxXZnpOVjIwblNaalovWVU1LzNLbUdFRUtESjBvQgpRNUNzaWR3clhwbURHVGlNTnJ5Wnp6K282VUpZVDBRSFFsUzYwR0FzRkJsYXdETXBMY0ZPdVNqdGUyL0UvV3dQCnV3dVBFc3Q1enVtMFcwNVJOTjlSRC9QczVnODJwM1N4SURPRjdxV3g0NzQ2VXkvZW9OR3EwZFFUeGlvcFhqcWQKQWNUeHFKVHc4RnA1OG5pbTArRVdlVHUvWDdHbjAyTEFaSk15QUxOWmlGc3U4UXRjeEZUM1Y0Vk5kNVVoVUVaVgphQ0lVQlJ2emZWdjYrN1NMTG9xb2YraVhzWTMwekhRSHRxTldDR1ByRHY1dmVnWE80WGlVb0wzZ3BlSGZvM2N3ClVTV0I2UUlEQVFBQm80SFhNSUhVTUFrR0ExVWRFd1FDTUFBd0N3WURWUjBQQkFRREFnWGdNSUc1QmdOVkhSRUUKZ2JFd2dhNkNDbXQxWW1WeWJtVjBaWE9DRW10MVltVnlibVYwWlhNdVpHVm1ZWFZzZElJV2EzVmlaWEp1WlhSbApjeTVrWldaaGRXeDBMbk4yWTRJa2EzVmlaWEp1WlhSbGN5NWtaV1poZFd4MExuTjJZeTVqYkhWemRHVnlMbXh2ClkyRnNnZ2xzYjJOaGJHaHZjM1NDQlc1dlpHVXhnZ1Z1YjJSbE1vSWRiR0l0WVhCcGMyVnlkbVZ5TG10MVltVnkKYm1WMFpYTXViRzlqWVd5SEJBcGFBR1dIQkFwYUFHYUhCQXJwQUFHSEJIOEFBQUV3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFFTWxIYjNVMWJJWnBScVJpTTJoU2xHdWJ4TW5xT2FxN0JBOHBUWHR0dFFmVEtIOTNTbVBHU1JGCnFwYm1IUC9rRkNGS3FGSTFpWUFINnMrN2w4alZGNDVYTjFlMm5qRVpTZXROZ20yeVE2citWTzRRb3J0SGovTmEKMEpGNUxYb25wZVN0R0dUM3pMMmM1allPNTViUVFXbDVub1ZtWDY2ZHhBMU1KNk8xVVRBa0RhZUM4MjBENjY5OApOYlNta1FBTEJBampFWUROSTFpUXpYTGZvbWRKSGxXaHl0K2t1T1hqemxJRzNXNGZLc091S1BiZ1pZYlR1TTJRCkcySUErWFA0Z0pXeVRSVTBHM1l6UjJWTG9VLzNLaFJmZmpXQnI3UytCRlNGY2FLenFJdE5pcVRQKzM0aUNXVDYKZFZWSWxGV25icDNMY1hDUVNwYlV6N01FdjZEbTVQOD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBdWxUcndubnEwcENTenFkUkU4Mkg0ajZQcWNZa1RVQ0hmZ2FLNU9YWFV4K2ZYbmtICmlKTFdmek5WMjBuU1pqWi9ZVTUvM0ttR0VFS0RKMG9CUTVDc2lkd3JYcG1ER1RpTU5yeVp6eitvNlVKWVQwUUgKUWxTNjBHQXNGQmxhd0RNcExjRk91U2p0ZTIvRS9Xd1B1d3VQRXN0NXp1bTBXMDVSTk45UkQvUHM1ZzgycDNTeApJRE9GN3FXeDQ3NDZVeS9lb05HcTBkUVR4aW9wWGpxZEFjVHhxSlR3OEZwNThuaW0wK0VXZVR1L1g3R24wMkxBClpKTXlBTE5aaUZzdThRdGN4RlQzVjRWTmQ1VWhVRVpWYUNJVUJSdnpmVnY2KzdTTExvcW9mK2lYc1kzMHpIUUgKdHFOV0NHUHJEdjV2ZWdYTzRYaVVvTDNncGVIZm8zY3dVU1dCNlFJREFRQUJBb0lCQUFENllTSnNNV2RaaXV1Ngp4Um90Z2dFV0F2c0pKemVnbHhWNlExQmdSSGtUT1dydGg3U1gwTGhxTkpFcUdnaWZVSnZhSmFHcTRpRkR1QnlFCnJ1MEQzV1A3Mjk1clA5enFCeEppZXd3emNWZUlHWjZRNU5qY1NQNi9Bbnc0aGRsc2ExTHFLTmVmOTE4bWZ3bzEKZnYra1YrUHBYWUpRaDduUzkyb25vZTFMZ25yU3AxTnFYUGgveHh2UmQ4dnFZM3NZNGNMS1I1Y3J1Z3RnR0dOZgpzenlYYkE5bWh1UW1YZkMxcW5WVDBHeVBaWDE4RTZqblZSMjV5dUxENXZUZGhuRTMvcldkQUJiY1ducGpKV0JTCkw5KzUrYWtlUDFpY1NKaU5OT05uczFCRHpMUjVWUzlwRnRKR3VoQ3RvdWF1RXNNaEZheHJHZHNzbzhuWmFLR1gKamJFdmFPRUNnWUVBNHJOU3VGQTFsS1djcHM5Z2FBbFF3WWtBZG93YzdGU09zaUhTbHNPK3A1UWY5MFNsSm1YcApCS3IrVUd1UC9pNjFUKzhXTkVobFZndmJ6S21NWkJzUWN5eHVDUE1jQW96dE5kREhNcUtCV254aDJsb1BxTzYvCmNSTkhiTTk1Wlc4VEsra1YrTVZldnNGL0xVeTF6VmFUK01TSjUwNkMwc0ZsdllTZi82ZWNPazhDZ1lFQTBtbnkKRG44UUdFaWJNTDlrT1Y1d1ZlVXVzRGRXL25BRDArajk1VWZ6OGFkZWJyK2I5UHIrWkdXMDBhNk1kaDMxaWNSTwpCVjU2ektoWlB1ZGhLd2JGWW5Gcm5oK2Q0TERqb1huZVB4Mk4xUC9kZVQ1ZFNIKzFoTkJuNkYyKzJNRDJrc0R1ClFnVHo5dm00WnpLc3hQYm9Ud3ArMkVkeGFGRzd4cFhGM01PQnlrY0NnWUJic3FkYUVHK3I0ZFZjai9OeUFacWQKdmhubTJjUDFRRHE4Q1B4U3FYamI5Z2w4RGxNekZmUE1SSkk3MjFaU1BYaHZqY2tRZXR3cWt2OWthSXgyRFpCNAoxZGJvWGRYTm5rMXhBRE1pNHlLcGhEaGNoeU5nZExvUk5mZ2xKa0wzYVpkNm9ueVZ0TmdmRnN1bmVpanJsd0toCmxIWW5qdFZTQkpKdnQwNjByWXArOXdLQmdCNVNMaE53cy8wTDJYRTQ0MVJ4QzNjVlE1a1pJR3doOEN0RlUvRUsKWVZqZGFYcEVHbEUvS2hHRnBuemd6bFRuRkU3NS90US9QU3JveDVPTS9DK2JGaTZOY1ppanJiaUhSUVlyN1o3aQp2MkdHVFgvL1FLb0YzVDU2V2I3ZVkzWVF1SGVGWGRBZHJwcFVlZ0pGQnlpSy9BY0gyQ2VLaEFrb1hnckw0bXRoCnNQNVpBb0dBYng3SFB6NXMvR2t1cU1uKzJ0Sk5wMmwwSFB1UXRoZStqQ3p1UkVqdCs1RXN3TVZQLzNWWXVnOWcKUmlUVDhZL29hVERFcVV1c0MvbnR5MnFhcEVrQjVIaEE2eXpTRk9MVVcrSkw2bmorU0tKWXM2cWhtcDBsTWxPdgorOEdDRWRZOU56YTZxR0h3RXd6a25ibnVVOS9MZTB5YW90djVvNGZmMGp0Mjh1QUdRbkU9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
diff --git a/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
index 5ee3c0c..6b03150 100755
--- a/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-qa-subscriber.yaml
@@ -17,12 +17,19 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 imports:
   - custom_types/rcordsubscriber.yaml
+  - custom_types/bandwidthprofile.yaml
 
 description: Pre-provsion a subscriber
 
 topology_template:
   node_templates:
 
+    default_bp:
+      type: tosca.nodes.BandwidthProfile
+      properties:
+         name: Default
+         must-exist: true
+
     # Pre-provision the subscriber the subscriber
     onf_subscriber_1:
       type: tosca.nodes.RCORDSubscriber
@@ -35,6 +42,13 @@
         nas_port_id : "PON 1/1/03/1:1.1.1"
         circuit_id: foo1
         remote_id: bar1
+      requirements:
+        - upstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne
+        - downstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne
 
     onf_subscriber_2:
       type: tosca.nodes.RCORDSubscriber
@@ -47,6 +61,13 @@
         nas_port_id : "PON 1/1/04/1:1.1.1"
         circuit_id: foo2
         remote_id: bar2
+      requirements:
+        - upstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne
+        - downstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne
 
     onf_subscriber_3:
       type: tosca.nodes.RCORDSubscriber
@@ -59,3 +80,10 @@
         nas_port_id : "PON 1/1/05/1:1.1.1"
         circuit_id: foo3
         remote_id: bar3
+      requirements:
+        - upstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne
+        - downstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne