diff --git a/build-debian-packages-telegraf.groovy b/build-debian-packages-telegraf.groovy
index 293783b..b946688 100644
--- a/build-debian-packages-telegraf.groovy
+++ b/build-debian-packages-telegraf.groovy
@@ -4,7 +4,7 @@
 def aptly = new com.mirantis.mk.Aptly()
 
 def timestamp = common.getDatetime()
-def version = timestamp
+def version = "1.3~${timestamp}"
 
 node('docker') {
     try{
@@ -56,7 +56,7 @@
                         cd src/github.com/influxdata/telegraf &&
                         scripts/build.py --package --version=\"${version}\" --platform=linux --arch=amd64""")
                 }
-                archiveArtifacts artifacts: "${workingDir}/*.deb"
+                archiveArtifacts artifacts: "${workingDir}/telegraf/build/*.deb"
             }
             if (UPLOAD_APTLY.toBoolean()) {
                 lock("aptly-api") {
diff --git a/lab-pipeline.groovy b/lab-pipeline.groovy
index 3e44bfa..96b052c 100644
--- a/lab-pipeline.groovy
+++ b/lab-pipeline.groovy
@@ -295,6 +295,7 @@
                     // keystone:client must be called locally
                     //salt.runSaltProcessStep(saltMaster, 'I@keystone:client', 'cmd.run', ['salt-call state.sls keystone.client'], null, true)
                     salt.runSaltProcessStep(saltMaster, 'I@keystone:server', 'service.restart', ['apache2'])
+                    sleep(30)
                     salt.enforceState(saltMaster, 'I@keystone:client', 'keystone.client', true)
                     salt.enforceState(saltMaster, 'I@keystone:client', 'keystone.client', true)
                     salt.runSaltProcessStep(saltMaster, 'I@keystone:server', 'cmd.run', ['. /root/keystonerc; keystone service-list'], null, true)