diff --git a/packages/k8s/src/k8s/settings.ts b/packages/k8s/src/k8s/settings.ts
index e05fa2d..d1c0f02 100644
--- a/packages/k8s/src/k8s/settings.ts
+++ b/packages/k8s/src/k8s/settings.ts
@@ -23,7 +23,7 @@ export function namespace(): string {
 }
 
 export function registryHost(): string {
-  const name = 'RUNNER_CONTAINER_HOOKS_REGISTRY_HOST'
+  const name = 'ACTIONS_RUNNER_CONTAINER_HOOKS_REGISTRY_HOST'
   if (process.env[name]) {
     return process.env[name]
   }
@@ -31,7 +31,7 @@ export function registryHost(): string {
 }
 
 export function registryPort(): number {
-  const name = 'RUNNER_CONTAINER_HOOKS_REGISTRY_PORT'
+  const name = 'ACTIONS_RUNNER_CONTAINER_HOOKS_REGISTRY_PORT'
   if (process.env[name]) {
     return parseInt(process.env[name])
   }
@@ -39,7 +39,7 @@ export function registryPort(): number {
 }
 
 export function registryNodePort(): number {
-  const name = 'RUNNER_CONTAINER_HOOKS_REGISTRY_NODE_PORT'
+  const name = 'ACTIONS_RUNNER_CONTAINER_HOOKS_REGISTRY_NODE_PORT'
   if (process.env[name]) {
     return parseInt(process.env[name])
   }
diff --git a/packages/k8s/tests/test-setup.ts b/packages/k8s/tests/test-setup.ts
index 9e94d1f..cb04d1a 100644
--- a/packages/k8s/tests/test-setup.ts
+++ b/packages/k8s/tests/test-setup.ts
@@ -78,6 +78,15 @@ export class TestHelper {
         0
       )
       .catch(e => {})
+    await k8sApi
+      .deleteNamespacedPod(
+        `${this.podName}-kaniko`,
+        'default',
+        undefined,
+        undefined,
+        0
+      )
+      .catch(e => {})
   }
   public createFile(fileName?: string, content = ''): string {
     const filePath = `${this.tempDirPath}/${fileName || uuidv4()}`