diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh
index 4d84c5e3c..3c6699d9d 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
diff --git a/BUILD/mdbci/templates/install.json.template b/BUILD/mdbci/templates/install.json.template
index 39c265c97..aa9715d71 100644
--- a/BUILD/mdbci/templates/install.json.template
+++ b/BUILD/mdbci/templates/install.json.template
@@ -5,7 +5,8 @@
         "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 04e92925b..5de7c681f 100755
--- a/BUILD/mdbci/upgrade_test.sh
+++ b/BUILD/mdbci/upgrade_test.sh
@@ -33,9 +33,6 @@ 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 up $name --attempts=1
@@ -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 ${new_target} $name/maxscale
+${mdbci_dir}/mdbci install_product --product maxscale_ci $name/maxscale
 
 res=$?