diff --git a/eng/common/pipelines/templates/steps/bypass-local-dns.yml b/eng/common/pipelines/templates/steps/bypass-local-dns.yml
index 54f49c33714..91b5c497830 100644
--- a/eng/common/pipelines/templates/steps/bypass-local-dns.yml
+++ b/eng/common/pipelines/templates/steps/bypass-local-dns.yml
@@ -3,4 +3,9 @@ steps:
     # https://github.com/actions/virtual-environments/issues/798
     - script: sudo ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf
       displayName: Bypass local DNS server to workaround issue resolving cognitiveservices names
-      condition: and(succeededOrFailed(), eq(variables['OSVmImage'], 'ubuntu-18.04'))
\ No newline at end of file
+      condition: |
+        and(
+          succeededOrFailed(),
+          eq(variables['OSVmImage'], 'ubuntu-18.04'),
+          eq(variables['Container'], '')
+        )
diff --git a/eng/common/pipelines/templates/steps/verify-agent-os.yml b/eng/common/pipelines/templates/steps/verify-agent-os.yml
index 4551279e13c..12eaa0d3e1e 100644
--- a/eng/common/pipelines/templates/steps/verify-agent-os.yml
+++ b/eng/common/pipelines/templates/steps/verify-agent-os.yml
@@ -1,4 +1,4 @@
-parameters: 
+parameters:
   OSVmImage: $(OSVmImage)
 
 steps: