diff --git a/xos-core/templates/tests/test-xos-core-api.yaml b/xos-core/templates/tests/test-xos-core-api.yaml
index 78622a5..86ed0a0 100644
--- a/xos-core/templates/tests/test-xos-core-api.yaml
+++ b/xos-core/templates/tests/test-xos-core-api.yaml
@@ -1,3 +1,4 @@
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,21 +17,25 @@
 kind: Pod
 metadata:
   name: "{{ .Release.Name }}-api-test"
+  labels:
+    {{- include "xos-core.release_labels" . | indent 4 }}
   annotations:
     "helm.sh/hook": test-success
 spec:
   containers:
-  - name: {{ .Release.Name }}-api-test
-    image: {{ .Values.images.api_tester.repository }}:{{ .Values.images.api_tester.tag }}
-    imagePullPolicy: {{ .Values.images.api_tester.pullPolicy }}
-    env:
-      - name: SERVER_IP
-        value: 'xos-chameleon'
-      - name: SERVER_PORT
-        value: '9101'
-      - name: XOS_USER
-        value: '{{ .Values.xosAdminUser }}'
-      - name: XOS_PASSWD
-        value: '{{ .Values.xosAdminPassword }}'
-    command: [ "pybot", "-L", "TRACE", "-d", "Log", "-T", "Ch_DeploymentTest.txt", "Ch_SiteTest.txt", "Ch_UsersTest.txt", "Ch_SliceTest.txt", "Ch_ServiceTest.txt" ]
+    - name: {{ .Release.Name }}-api-test
+      image: {{ .Values.xos_api_testerImage }}
+      imagePullPolicy: {{ .Values.imagePullPolicy }}
+      env:
+        - name: SERVER_IP
+          value: 'xos-chameleon'
+        - name: SERVER_PORT
+          value: '9101'
+        - name: XOS_USER
+          value: {{ .Values.xosAdminUser | quote }}
+        - name: XOS_PASSWD
+          value: {{ .Values.xosAdminPassword | quote}}
+        - name: SITE_NAME
+          value: {{ .Values.cordSiteName | quote }}
+      command: ["pybot", "-L", "TRACE", "-d", "Log", "-T", "Ch_DeploymentTest.txt", "Ch_SiteTest.txt", "Ch_UsersTest.txt", "Ch_SliceTest.txt", "Ch_ServiceTest.txt"]
   restartPolicy: Never