diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh
index 4d84c5e3c..26fb51ab6 100755
--- a/BUILD/mdbci/copy_repos.sh
+++ b/BUILD/mdbci/copy_repos.sh
@@ -38,3 +38,5 @@ $(<${script_dir}/templates/repository-config/deb.json.template)
 " 2> /dev/null > ${path_prefix}/${platform}_${platform_version}.json
 fi
 cd $dir
+
+${mdbci_dir}/mdbci generate-product-repositories --product maxscale_ci --product-version $target
diff --git a/BUILD/mdbci/templates/install.json.template b/BUILD/mdbci/templates/install.json.template
index 81db5a9de..aa9715d71 100644
--- a/BUILD/mdbci/templates/install.json.template
+++ b/BUILD/mdbci/templates/install.json.template
@@ -3,8 +3,10 @@
   {
         "hostname" : "maxscale",
         "box" : "$box",
+        "memory_size" : "4096",
         "product" : {
-                "name": "maxscale"
+                "name" : "maxscale",
+                "version" : "${old_target}"
         }
 
   }
diff --git a/BUILD/mdbci/upgrade_test.sh b/BUILD/mdbci/upgrade_test.sh
index c30069dcb..fbac44d70 100755
--- a/BUILD/mdbci/upgrade_test.sh
+++ b/BUILD/mdbci/upgrade_test.sh
@@ -33,11 +33,8 @@ if [ -d "install_$box" ]; then
         ${mdbci_dir}/mdbci destroy $name
 fi
 
-${mdbci_dir}/repository-config/generate_all.sh repo.d
-${mdbci_dir}/repository-config/maxscale-release.sh $old_target repo.d
-
 # starting VM for build
-${mdbci_dir}/mdbci --override --template $MDBCI_VM_PATH/$name.json --repo-dir $dir/repo.d generate $name 
+${mdbci_dir}/mdbci --override --template $MDBCI_VM_PATH/$name.json generate $name
 ${mdbci_dir}/mdbci up $name --attempts=1
 if [ $? != 0 ] ; then
         if [ $? != 0 ] ; then
@@ -61,12 +58,8 @@ export sshopt="$scpopt $sshuser@$IP"
 
 old_version=`ssh $sshopt "maxscale --version" `
 
-rm -rf repo.d
-${mdbci_dir}/repository-config/generate_all.sh repo.d
-${mdbci_dir}/repository-config/maxscale-ci.sh $target repo.d
-
-${mdbci_dir}/mdbci setup_repo --product maxscale --repo-dir $dir/repo.d $name/maxscale
-${mdbci_dir}/mdbci install_product --product maxscale $name/maxscale
+${mdbci_dir}/mdbci setup_repo --product maxscale_ci --product-version ${target} $name/maxscale
+${mdbci_dir}/mdbci install_product --product maxscale_ci $name/maxscale
 
 res=$?
 
@@ -84,7 +77,7 @@ scp $scpopt ${script_dir}/cnf/$cnf_file $sshuser@$IP:~/
 
 . ${script_dir}/configure_log_dir.sh
 
-${mdbci_dir}/mdbci ssh --command 'service --help' $name/maxscale
+${mdbci_dir}/mdbci ssh --command 'sudo service --help' $name/maxscale
 if [ $? == 0 ] ; then
 	maxscale_start_cmd="sudo service maxscale start"
 else
@@ -92,19 +85,25 @@ else
 	maxscale_start_cmd="sudo ./maxscale_start.sh 2> /dev/null &"
 fi
 
-
-
 ssh $sshopt "sudo cp $cnf_file /etc/maxscale.cnf"
 ssh $sshopt "$maxscale_start_cmd" &
 pid_to_kill=$!
 
-sleep 10
+for  i in {1..10}
+do
+    sleep 5
+    ssh $sshopt $maxadmin_command
+    maxadm_exit=$?
+    if [ $maxadm_exit == 0 ] ; then
+        break
+    fi
+done
 
-ssh $sshopt $maxadmin_command
-if [ $? != 0 ] ; then
+if [ $maxadm_exit != 0 ] ; then
 	echo "Maxadmin executing error"
 	res=1
 fi
+
 maxadmin_out=`ssh $sshopt $maxadmin_command`
 echo $maxadmin_out | grep "CLI"
 if [ $? != 0 ] ; then
diff --git a/maxscale-system-test/mdbci/create_config.sh b/maxscale-system-test/mdbci/create_config.sh
index 12f899323..1e2795486 100755
--- a/maxscale-system-test/mdbci/create_config.sh
+++ b/maxscale-system-test/mdbci/create_config.sh
@@ -7,12 +7,6 @@ export script_dir="$(dirname $(readlink -f $0))"
 
 . ${script_dir}/set_run_test_variables.sh
 
-${mdbci_dir}/repository-config/generate_all.sh repo.d
-${mdbci_dir}/repository-config/maxscale-ci.sh $target repo.d
-
-
-export repo_dir=$dir/repo.d/
-
 export provider=`${mdbci_dir}/mdbci show provider $box --silent 2> /dev/null`
 export backend_box=${backend_box:-"centos_7_"$provider}
 
@@ -23,15 +17,21 @@ fi
 ${mdbci_dir}/mdbci destroy $name
 mkdir -p ${MDBCI_VM_PATH}/$name
 
-mkdir ${MDBCI_VM_PATH}/$name/cnf
-cp -r ${cnf_path}/* ${MDBCI_VM_PATH}/$name/cnf/
-export cnd_path="${MDBCI_VM_PATH}/$name/cnf/"
+export cnf_path="${MDBCI_VM_PATH}/$name/cnf/"
+if [ "$product" == "mysql" ] ; then
+  export cnf_path=${MDBCI_VM_PATH}/$name/cnf/mysql56/
+fi
+
 
   eval "cat <<EOF
 $(<${script_dir}/templates/${template}.json.template)
 " 2> /dev/null > ${MDBCI_VM_PATH}/${name}.json
 
-${mdbci_dir}/mdbci --override --template  ${MDBCI_VM_PATH}/${name}.json --repo-dir ${repo_dir} generate $name
+${mdbci_dir}/mdbci --override --template  ${MDBCI_VM_PATH}/${name}.json generate $name
+
+mkdir ${MDBCI_VM_PATH}/$name/cnf
+cp -r ${script_dir}/cnf/* ${MDBCI_VM_PATH}/$name/cnf/
+
 
 while [ -f ~/vagrant_lock ]
 do
diff --git a/maxscale-system-test/mdbci/run_test_snapshot.sh b/maxscale-system-test/mdbci/run_test_snapshot.sh
index cff4ce3fe..64dd40803 100755
--- a/maxscale-system-test/mdbci/run_test_snapshot.sh
+++ b/maxscale-system-test/mdbci/run_test_snapshot.sh
@@ -9,7 +9,7 @@ function checkExitStatus {
         rm $lockFilePath
         echo "Snapshot lock file was deleted due to an error"
         exit 1
-    fi     
+    fi
 }
 
 set -x
@@ -43,8 +43,6 @@ done
 touch ${snapshot_lock_file}
 echo $JOB_NAME-$BUILD_NUMBER >> ${snapshot_lock_file}
 
-export repo_dir=$dir/repo.d/
-
 ${mdbci_dir}/mdbci snapshot revert --path-to-nodes $name --snapshot-name $snapshot_name
 
 if [ $? != 0 ]; then
@@ -60,14 +58,11 @@ fi
 
 . ${script_dir}/set_env.sh "$name"
 
-${mdbci_dir}/repository-config/maxscale-ci.sh $target repo.d
-
-
 ${mdbci_dir}/mdbci sudo --command 'yum remove maxscale -y' $name/maxscale
 ${mdbci_dir}/mdbci sudo --command 'yum clean all' $name/maxscale
 
-${mdbci_dir}/mdbci setup_repo --product maxscale $name/maxscale --repo-dir $repo_dir 
-${mdbci_dir}/mdbci install_product --product maxscale $name/maxscale --repo-dir $repo_dir
+${mdbci_dir}/mdbci setup_repo --product maxscale_ci --product-version ${target} $name/maxscale
+${mdbci_dir}/mdbci install_product --product maxscale_ci $name/maxscale
 
 checkExitStatus $? "Error installing Maxscale" $snapshot_lock_file
 
@@ -79,11 +74,12 @@ make
 ./check_backend --restart-galera
 
 checkExitStatus $? "Failed to check backends" $snapshot_lock_file
-
+ulimit -c unlimited
 ctest $test_set -VV -D Nightly
-
+cp core.* ${logs_publish_dir}
 ${script_dir}/copy_logs.sh
 
+
 # Removing snapshot_lock
 rm ${snapshot_lock_file}
 
diff --git a/maxscale-system-test/mdbci/templates/big.json.template b/maxscale-system-test/mdbci/templates/big.json.template
index 56c0330ee..eb7c36901 100644
--- a/maxscale-system-test/mdbci/templates/big.json.template
+++ b/maxscale-system-test/mdbci/templates/big.json.template
@@ -145,7 +145,8 @@
         "hostname" : "maxscale",
         "box" : "centos_7_aws_large",
         "product" : {
-                "name": "maxscale"
+                "name" : "maxscale_ci",
+                "version" : "${target}"
         }
 
   }
diff --git a/maxscale-system-test/mdbci/templates/big15.json.template b/maxscale-system-test/mdbci/templates/big15.json.template
index 1297ea96a..0fe08cf4d 100644
--- a/maxscale-system-test/mdbci/templates/big15.json.template
+++ b/maxscale-system-test/mdbci/templates/big15.json.template
@@ -222,7 +222,8 @@
         "hostname" : "maxscale",
         "box" : "centos_7_aws_large",
         "product" : {
-                "name": "maxscale"
+                "name" : "maxscale_ci",
+                "version" : "${target}"
         }
 
   }
diff --git a/maxscale-system-test/mdbci/templates/default.json.template b/maxscale-system-test/mdbci/templates/default.json.template
index 2376e46a7..1523eb6c2 100644
--- a/maxscale-system-test/mdbci/templates/default.json.template
+++ b/maxscale-system-test/mdbci/templates/default.json.template
@@ -110,7 +110,8 @@
         "box" : "${box}",
         "memory_size" : "${vm_memory}",
         "product" : {
-                "name": "maxscale"
+                "name" : "maxscale_ci",
+                "version" : "${target}"
         }
 
   }
diff --git a/maxscale-system-test/mdbci/templates/nogalera.json.template b/maxscale-system-test/mdbci/templates/nogalera.json.template
index 31f03af0b..14b654a61 100644
--- a/maxscale-system-test/mdbci/templates/nogalera.json.template
+++ b/maxscale-system-test/mdbci/templates/nogalera.json.template
@@ -58,7 +58,8 @@
         "box" : "${box}",
         "memory_size" : "${vm_memory}",
         "product" : {
-                "name": "maxscale"
+                "name" : "maxscale_ci",
+                "version" : "${target}"
         }
 
   }
diff --git a/maxscale-system-test/mdbci/templates/performance.json.template b/maxscale-system-test/mdbci/templates/performance.json.template
index a767f9fc2..8d5652cbd 100644
--- a/maxscale-system-test/mdbci/templates/performance.json.template
+++ b/maxscale-system-test/mdbci/templates/performance.json.template
@@ -60,7 +60,8 @@
         "box" : "###box###",
         "memory_size" : "2048",
         "product" : {
-                "name": "maxscale"
+                "name" : "maxscale_ci",
+                "version" : "${target}"
         }
 
   }