diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index cc9c924..f92015e 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -152,6 +152,7 @@
 
         # the ETCD chart use "auth" for resons different than BBsim, so strip that away
         ETCD_FLAGS=$(echo ${extraHelmFlags} | sed -e 's/--set auth=false / /g') | sed -e 's/--set auth=true / /g'
+        ETCD_FLAGS+=" --set memoryMode=${inMemoryEtcdStorage} "
         helm install -f $WORKSPACE/kind-voltha/minimal-values.yaml --set etcd.replicas=3 -n etcd incubator/etcd $ETCD_FLAGS
 
         if [ ${withMonitoring} = true ] ; then
@@ -253,14 +254,8 @@
             cat BBSM-12345123451234512345-00000000000001-v1.json | kubectl exec -it $(kubectl get pods -l app=etcd | awk 'NR==2{print $1}') etcdctl put service/voltha/omci_mibs/templates/BBSM/12345123451234512345/00000000000001
           fi
 
-          # Set extra openolt-adapter logs
-          voltctl log level set INFO adapter-open-olt
-          voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/db
-          voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/probe
-          voltctl log level set WARN adapter-open-olt#github.com/opencord/voltha-lib-go/v3/pkg/kafka
-
-          # Set extra logs on olt app in onos
-          sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 log:set DEBUG org.opencord.olt
+          # Set extra logs on the dhcpl2relay app in onos
+          sshpass -e ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 8101 karaf@127.0.0.1 log:set DEBUG org.opencord.dhcpl2relay
 
           # Start the tcp-dump in ofagent
           if [ ${withPcap} = true ] ; then
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index d14b95c..18b3e99 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -152,9 +152,9 @@
           atomixReplicas: 3
           extraHelmFlags: '--set limits.memory=8192Mi --set defaults.rw_core.timeout=30s'
           withPcap: true
-          rwCoreImg: matteoscandolo/voltha-rw-core:flow-remove-log
+          rwCoreImg: matteoscandolo/voltha-rw-core:dhcp-logs
+          openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:dhcp-logs
           ofAgentImg: matteoscandolo/voltha-ofagent-go:vol-3242
-          # onosImg: andreacampanella/voltha-onos:onos-extended-timeouts
 
       # jobs for DT with 512 ONUs with a 8 openonu-adapters and clustered ONOS.
       - 'voltha-scale-measurements':
@@ -320,6 +320,7 @@
     onosStatInterval: 5
     volthaSystemTestsChange: ''
     kindVolthaChange: ''
+    inMemoryEtcdStorage: true
 
     parameters:
       - string:
@@ -487,15 +488,20 @@
           default: '{kindVolthaChange}'
           description: 'Download a change for gerrit in the kind-voltha repo, example value: "refs/changes/32/19132/1"'
 
+      - bool:
+          name: inMemoryEtcdStorage
+          default: '{inMemoryEtcdStorage}'
+          description: 'Wether to write ETCD keys on disk or keep them in memory (true=inMemory)'
+
     project-type: pipeline
     concurrent: false
 
     dsl: !include-raw-escape: pipeline/{pipeline-script}
 
-    triggers:
-      - timed: |
-                 TZ=America/Los_Angeles
-                 {time-trigger}
+    # triggers:
+    #   - timed: |
+    #              TZ=America/Los_Angeles
+    #              {time-trigger}
 
 - job-template:
     id: 'voltha-scale-measurements-dev'