diff --git a/vars/distroVersion.groovy b/vars/distroVersion.groovy
index 8f66f9600..0f667b2b2 100755
--- a/vars/distroVersion.groovy
+++ b/vars/distroVersion.groovy
@@ -38,6 +38,9 @@ String call(String distro, String branch) {
             'leap15':   ['master': '15.6',
                          '2.4':    '15.6',
                          '2.6':    '15.6'],
+            'sles15':   ['master': '15.7',
+                         '2.4':    '15.7',
+                         '2.6':    '15.7'],
             'ubuntu20': ['master': '20.04']][distro][branch]
 }
 
diff --git a/vars/functionalPackages.groovy b/vars/functionalPackages.groovy
index 75f710c8b..9b83b4de4 100644
--- a/vars/functionalPackages.groovy
+++ b/vars/functionalPackages.groovy
@@ -43,7 +43,7 @@ String call(String distro, Integer client_ver, String next_version, String add_d
              'Hopefully the daos-tests packages have the dependencies configured.'
     }
 
-    if (distro.startsWith('leap') ||
+    if (distro.startsWith('leap') || distro.startsWith('sles') ||
         distro.startsWith('el') || distro.startsWith('centos') ||
         distro.startsWith('rocky') || distro.startsWith('almalinux') ||
         distro.startsWith('rhel') || distro.startsWith('ubuntu')) {
diff --git a/vars/parseStageInfo.groovy b/vars/parseStageInfo.groovy
index 1fca00b89..b17a63cc7 100755
--- a/vars/parseStageInfo.groovy
+++ b/vars/parseStageInfo.groovy
@@ -97,6 +97,10 @@ Map call(Map config = [:]) {
             result['target'] = 'leap15'
             result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.3')
             new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
+        } else if (stage_name.contains('SLES 15.7')) {
+            result['target'] = 'sles15'
+            result['distro_version'] = cachedCommitPragma('SLES15-version', '15.7')
+            new_ci_target = cachedCommitPragma('SLES15-target', result['target'])
         } else if (stage_name.contains('Leap 15.4')) {
             result['target'] = 'leap15'
             result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.4')
@@ -105,10 +109,18 @@ Map call(Map config = [:]) {
             result['target'] = 'leap15'
             result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.5')
             new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
+        // RYON: Not sure if this is needed still with other changes now
+        } else if (stage_name.contains('SLES 15.7')) {
+            result['target'] = 'sles15'
+            result['distro_version'] = cachedCommitPragma('SLES15-version', '15.7')
+            new_ci_target = cachedCommitPragma('SLES15-target', result['target'])
+
+        // RYON: Not sure why it's duplicated ...  after rebase ...
         } else if (stage_name.contains('Leap 15.6')) {
             result['target'] = 'leap15'
+            // TODO: address this comment!!!
             // Until a mock opensuse-leap-15.6-x86-64.cfg is available provision with 15.5
-            result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.5')
+            result['distro_version'] = cachedCommitPragma('LEAP15-version', '15.6')
             new_ci_target = cachedCommitPragma('LEAP15-target', result['target'])
         } else if (stage_name.contains('Leap 15')) {
             result['target'] = 'leap15'
@@ -155,7 +167,8 @@ Map call(Map config = [:]) {
         result['java_pkg'] = 'java-1.8.0-openjdk'
     } else if (result['ci_target'].startsWith('ubuntu')) {
         result['java_pkg'] = 'openjdk-8-jdk'
-    } else if (result['ci_target'].startsWith('leap')) {
+    } else if (result['ci_target'].startsWith('leap') ||
+               result['ci_target'].startsWith('sles')) {
         result['java_pkg'] = 'java-1_8_0-openjdk'
     } else {
         error 'Java package not known for ' + result['ci_target']
diff --git a/vars/prRepos.groovy b/vars/prRepos.groovy
index 30c9ad4eb..1cf0d7d53 100644
--- a/vars/prRepos.groovy
+++ b/vars/prRepos.groovy
@@ -27,12 +27,15 @@ String call(String distro=null) {
             repos = cachedCommitPragma('PR-repos-el8')
         } else if (_distro.startsWith('el9')) {
             repos = cachedCommitPragma('PR-repos-el9')
+        } else if (_distro.startsWith('sles15')) {
+            repos = cachedCommitPragma('PR-repos-sles15')
         } else if (_distro.startsWith('leap15')) {
             repos = cachedCommitPragma('PR-repos-leap15')
         } else if (_distro.startsWith('ubuntu20')) {
             repos = cachedCommitPragma('PR-repos-ubuntu20')
         } else {
             error 'prRepos not implemented for ' + _distro
+            cachedCommitPragma('dump')
         }
     }
     return [repos,
diff --git a/vars/skipStage.groovy b/vars/skipStage.groovy
index d0687d704..1a6e6a1ee 100644
--- a/vars/skipStage.groovy
+++ b/vars/skipStage.groovy
@@ -427,6 +427,7 @@ boolean call(Map config = [:]) {
         case 'Functional on Leap 15.4':
         case 'Functional on Leap 15.5':
         case 'Functional on Leap 15.6':
+        case 'Functional on SLES 15.7':
             return skip_ftest('leap15', target_branch, tags)
         case 'Functional on Ubuntu 20.04':
             /* we don't do any testing on Ubuntu yet
@@ -529,6 +530,7 @@ boolean call(Map config = [:]) {
         case 'Test RPMs on Leap 15.4':
         case 'Test RPMs on Leap 15.5':
         case 'Test RPMs on Leap 15.6':
+        case 'Test RPMs on Leap 15.7':
             return !paramsValue('CI_RPMS_leap15_TEST', true) ||
                    target_branch =~ branchTypeRE('weekly') ||
                    skip_stage_pragma('build-leap15-rpm') ||