diff --git a/tools/jenkins/jenkins_home/build_jenkins.sh b/tools/jenkins/jenkins_home/build_jenkins.sh
index bd17f1c..bbba8b0 100755
--- a/tools/jenkins/jenkins_home/build_jenkins.sh
+++ b/tools/jenkins/jenkins_home/build_jenkins.sh
@@ -41,6 +41,13 @@
 </hudson.plugins.git.GitSCM_-DescriptorImpl>
 EOF
 
+# Add build numbers
+for job in ${`ls jobs`// / }; do
+    if [ ! -e jobs/$job/nextBuildNumber ]; then
+        echo 1 > jobs/$job/nextBuildNumber
+    fi
+done
+
 # Set ownership to jenkins
 chown -R jenkins $CUR_DIR
 
diff --git a/tools/jenkins/jenkins_home/jobs/kvm/config.xml b/tools/jenkins/jenkins_home/jobs/kvm/config.xml
index ccf0541..453044b 100644
--- a/tools/jenkins/jenkins_home/jobs/kvm/config.xml
+++ b/tools/jenkins/jenkins_home/jobs/kvm/config.xml
@@ -47,7 +47,7 @@
       <name>ADAPTER</name>
       <values>
         <string>euca</string>
-        <string>floatingips</string>
+        <string>floating_ips</string>
       </values>
     </hudson.matrix.TextAxis>
   </axes>
@@ -69,4 +69,4 @@
   <publishers/>
   <buildWrappers/>
   <runSequentially>false</runSequentially>
-</matrix-project>
\ No newline at end of file
+</matrix-project>
diff --git a/tools/jenkins/jenkins_home/jobs/kvm/nextBuildNumber b/tools/jenkins/jenkins_home/jobs/kvm/nextBuildNumber
deleted file mode 100644
index d00491f..0000000
--- a/tools/jenkins/jenkins_home/jobs/kvm/nextBuildNumber
+++ /dev/null
@@ -1 +0,0 @@
-1