diff --git a/jjb/pipeline/omec-container-remote.groovy b/jjb/pipeline/omec-container-remote.groovy
index 0b743eb..51270f2 100644
--- a/jjb/pipeline/omec-container-remote.groovy
+++ b/jjb/pipeline/omec-container-remote.groovy
@@ -40,7 +40,7 @@
     always {
       // Copy artifacts from the remote job dir (make sure both jobs run on the same node)
       sh """
-      cp -r ../${params.project}_premerge_${params.pod}/artifacts/* ./
+      cp -r ../${params.project}_premerge_${params.pod}/* ./
       """
       archiveArtifacts artifacts: "**/*.*", allowEmptyArchive: true
     }
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 53452a0..3dea276 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -235,7 +235,7 @@
               teardown: true
             - target: openonu-go-adapter-omci-hardening-passed-test
               workflow: att
-              flags: "--set omci_response_rate=9 --set omci_timeout=1s"
+              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
               teardown: true
             - target: openonu-go-adapter-omci-hardening-failed-test
               workflow: att
@@ -291,7 +291,7 @@
               teardown: true
             - target: openonu-go-adapter-omci-hardening-passed-test
               workflow: att
-              flags: "--set omci_response_rate=9 --set omci_timeout=1s"
+              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
               teardown: true
             - target: openonu-go-adapter-omci-hardening-failed-test
               workflow: att
@@ -349,7 +349,7 @@
               teardown: true
             - target: openonu-go-adapter-omci-hardening-passed-test
               workflow: att
-              flags: "--set omci_response_rate=9 --set omci_timeout=1s"
+              flags: "--set omci_response_rate=9 --set voltha-adapter-openonu.adapter_open_onu.omci_timeout=1s"
               teardown: true
             - target: openonu-go-adapter-omci-hardening-failed-test
               workflow: att