diff --git a/conf/robottelo.yaml.template b/conf/robottelo.yaml.template
index 6d22a26a7c..05bfdbcc22 100644
--- a/conf/robottelo.yaml.template
+++ b/conf/robottelo.yaml.template
@@ -16,6 +16,10 @@ ROBOTTELO:
   # Satellite version supported by this branch
   # UNDR version is used for some URL composition
   SATELLITE_VERSION: "6.14"
+  # Update non-ga versions with each release
+  SAT_NON_GA_VERSIONS:
+    - '6.16'
+    - '6.17'
   # The Base OS RHEL Version(x.y) where the satellite would be installed
   RHEL_VERSION: "8.10"
   # Dynaconf and Dynaconf hooks related options
diff --git a/robottelo/config/validators.py b/robottelo/config/validators.py
index bf3d313b51..bf70b2487a 100644
--- a/robottelo/config/validators.py
+++ b/robottelo/config/validators.py
@@ -316,6 +316,12 @@
     ],
     robottelo=[
         Validator('robottelo.settings.ignore_validation_errors', is_type_of=bool, default=False),
+        Validator(
+            'robottelo.sat_non_ga_versions',
+            is_type_of=list,
+            default=[],
+            cast=lambda x: list(map(str, x)),
+        ),
     ],
     shared_function=[
         Validator('shared_function.storage', is_in=('file', 'redis'), default='file'),
diff --git a/robottelo/constants/__init__.py b/robottelo/constants/__init__.py
index 861d3038a6..59965775ca 100644
--- a/robottelo/constants/__init__.py
+++ b/robottelo/constants/__init__.py
@@ -8,7 +8,6 @@
 # This should be updated after each version branch
 SATELLITE_VERSION = "6.14"
 SATELLITE_OS_VERSION = "8"
-SAT_NON_GA_VERSIONS = ['6.14', '6.15']
 
 # Default system ports
 HTTPS_PORT = '443'
diff --git a/tests/foreman/maintain/test_advanced.py b/tests/foreman/maintain/test_advanced.py
index 219a22d03d..d893c8abf5 100644
--- a/tests/foreman/maintain/test_advanced.py
+++ b/tests/foreman/maintain/test_advanced.py
@@ -16,7 +16,7 @@
 import yaml
 
 from robottelo.config import robottelo_tmp_dir, settings
-from robottelo.constants import MAINTAIN_HAMMER_YML, SAT_NON_GA_VERSIONS
+from robottelo.constants import MAINTAIN_HAMMER_YML
 from robottelo.hosts import get_sat_rhel_version, get_sat_version
 
 sat_x_y_release = f'{get_sat_version().major}.{get_sat_version().minor}'
@@ -298,7 +298,7 @@ def test_positive_satellite_repositories_setup(sat_maintain):
     """
     sat_version = ".".join(sat_maintain.version.split('.')[0:2])
     result = sat_maintain.cli.Advanced.run_repositories_setup(options={'version': sat_version})
-    if sat_version not in SAT_NON_GA_VERSIONS:
+    if sat_version not in settings.robottelo.sat_non_ga_versions:
         assert result.status == 0
         assert 'FAIL' not in result.stdout
         result = sat_maintain.execute('yum repolist')
@@ -331,7 +331,7 @@ def test_positive_capsule_repositories_setup(sat_maintain):
     """
     sat_version = ".".join(sat_maintain.version.split('.')[0:2])
     result = sat_maintain.cli.Advanced.run_repositories_setup(options={'version': sat_version})
-    if sat_version not in SAT_NON_GA_VERSIONS:
+    if sat_version not in settings.robottelo.sat_non_ga_versions:
         assert result.status == 0
         assert 'FAIL' not in result.stdout
         result = sat_maintain.execute('yum repolist')