diff --git a/vars/distroVersion.groovy b/vars/distroVersion.groovy
index 8f66f9600..c405c4f4d 100755
--- a/vars/distroVersion.groovy
+++ b/vars/distroVersion.groovy
@@ -33,7 +33,7 @@ String call(String distro, String branch) {
     return ['el8':      ['master': '8.8',
                          '2.4':    '8.8',
                          '2.6':    '8.8'],
-            'el9':      ['master': '9.4',
+            'el9':      ['master': '9.7',
                          '2.6':    '9.4'],
             'leap15':   ['master': '15.6',
                          '2.4':    '15.6',
@@ -48,7 +48,7 @@ assert(call('leap15', 'master') == '15.6')
 assert(call('el8', '2.4') == '8.8')
 assert(call('el8', '2.6') == '8.8')
 assert(call('el8', 'master') == '8.8')
-assert(call('el9', 'master') == '9.4')
+assert(call('el9', 'master') == '9.7')
 assert(call('el9', '2.6') == '9.4')
 
 /* Uncomment to do further testing
diff --git a/vars/unitTest.groovy b/vars/unitTest.groovy
index 0f6c2d8a3..68bbc31fc 100755
--- a/vars/unitTest.groovy
+++ b/vars/unitTest.groovy
@@ -71,6 +71,8 @@
    *                             default is false.
    *
    * config['unstash_tests']     Un-stash -tests, default is true.
+   *
+   * config['image_version']     Image version to use for provisioning, e.g. el8.8, leap15.6, etc.
    */
 
 Map afterTest(Map config, Map testRunInfo) {
@@ -136,6 +138,11 @@ Map call(Map config = [:]) {
         }
     }
 
+    String image_version = config.get('image_version', '') ?:
+        (stage_info['ci_target'] =~ /([a-z]+)(.*)/)[0][1] + stage_info['distro_version']
+
+    println("image_version = ${image_version}")
+
     Map runData = provisionNodes(
                  NODELIST: nodelist,
                  node_count: stage_info['node_count'],
@@ -149,6 +156,8 @@ Map call(Map config = [:]) {
         target_stash += '-' + stage_info['build_type']
     }
 
+    println("target_stash = ${target_stash}")
+
     List stashes = []
     if (config['stashes']) {
         stashes = config['stashes']