diff --git a/jjb/bbsim-validation.yaml b/jjb/bbsim-validation.yaml
index f76172a..4ca9fe3 100644
--- a/jjb/bbsim-validation.yaml
+++ b/jjb/bbsim-validation.yaml
@@ -57,8 +57,8 @@
 
       - string:
          name: EmulationMode
-         default: '--set emulation_mode=default'
-         description: 'Emulation for BBSIM (both|aaa|default)'
+         default: '--set emulation_mode=both'
+         description: 'Emulation for BBSIM (both|aaa)'
 
       - string:
          name: TestTags
@@ -72,8 +72,8 @@
 
       - bool:
          name: ArchiveLogs
-         default: false
-         description: 'Archive all pod logs after test run. Default to false as logs are very large'
+         default: true
+         description: 'Archive all pod logs after test run'
 
     project-type: pipeline
     concurrent: false
@@ -127,8 +127,8 @@
 
       - string:
          name: EmulationMode
-         default: '--set emulation_mode=default'
-         description: 'Emulation for BBSIM (both|aaa|default)'
+         default: '--set emulation_mode=both'
+         description: 'Emulation for BBSIM (both|aaa)'
 
       - string:
          name: TestTags
@@ -140,10 +140,10 @@
          default: '300s'
          description: 'timeout for each test case (increase as you scale up)'
 
-      - string:
+      - bool:
          name: ArchiveLogs
-         default: false
-         description: 'Archive all pod logs after test run. Default to false as logs are very large'
+         default: true
+         description: 'Archive all pod logs after test run'
 
     project-type: pipeline
     concurrent: false