diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index 276ff267e1a..44307be22cf 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -9,6 +9,7 @@ env:
     PYCURL_SSL_LIBRARY: openssl
     ROBOTTELO_BUGZILLA__API_KEY: ${{ secrets.BUGZILLA_KEY }}
     ROBOTTELO_JIRA__API_KEY: ${{ secrets.JIRA_KEY }}
+    ROBOTTELO_ROBOTTELO__SETTINGS__SKIP_VALIDATION: true
 
 jobs:
   codechecks:
diff --git a/conf/certs.yaml.template b/conf/certs.yaml.template
deleted file mode 100644
index e2b86d6d7bd..00000000000
--- a/conf/certs.yaml.template
+++ /dev/null
@@ -1,6 +0,0 @@
-CERTS:
-  CERT_FILE: "~/certs/server.crt"
-  KEY_FILE: "~/certs/server.key"
-  REQ_FILE: "~/certs/server.csr"
-  # CA cert (a.k.a cacert.crt or rootCA.pem) can be used as bundle file.
-  CA_BUNDLE_FILE: "~/certs/rootCA.pem"
diff --git a/conf/clients.yaml.template b/conf/clients.yaml.template
deleted file mode 100644
index 710a09bb68d..00000000000
--- a/conf/clients.yaml.template
+++ /dev/null
@@ -1,5 +0,0 @@
-CLIENTS:
-  # Provisioning server hostname where the clients will be created
-  PROVISIONING_SERVER:
-  # Path on the provisioning server where the virtual images will be stored, default "/var/lib/libvirt/images/"
-  IMAGE_DIR:
diff --git a/conf/discovery.yaml.template b/conf/discovery.yaml.template
deleted file mode 100644
index a24040aff06..00000000000
--- a/conf/discovery.yaml.template
+++ /dev/null
@@ -1,3 +0,0 @@
-DISCOVERY:
-  SATELLITE_VERSION_SHORT: "@jinja {{this.robottelo.satellite_version | replace('.', '')}}"
-  DISCOVERY_ISO: "discovery_image_sat{this[discovery].satellite_version_short}.iso"
diff --git a/conf/distro.yaml.template b/conf/distro.yaml.template
deleted file mode 100644
index 061374b4565..00000000000
--- a/conf/distro.yaml.template
+++ /dev/null
@@ -1,6 +0,0 @@
-DISTRO:
-  IMAGE_EL6: rhel610
-  IMAGE_EL7: rhel79-20200908.1
-  IMAGE_EL8: rhel820-20200423.0
-  IMAGE_SLES11: sles-11-4
-  IMAGE_SLES12: sles-12-3
diff --git a/conf/robottelo.yaml.template b/conf/robottelo.yaml.template
index 7bf111cdc65..689c1f34fff 100644
--- a/conf/robottelo.yaml.template
+++ b/conf/robottelo.yaml.template
@@ -21,3 +21,4 @@ ROBOTTELO:
   # Dynaconf and Dynaconf hooks related options
   SETTINGS:
     GET_FRESH: true
+    SKIP_VALIDATION: false
diff --git a/robottelo/config/__init__.py b/robottelo/config/__init__.py
index d761dd06e91..8c18a4550b6 100644
--- a/robottelo/config/__init__.py
+++ b/robottelo/config/__init__.py
@@ -40,10 +40,12 @@ def get_settings():
         try:
             settings.validators.validate()
         except ValidationError as err:
-            logger.warning(
-                f'Dynaconf validation failed, continuing for the sake of unit tests\n{err}'
-            )
-
+            if settings.robottelo.settings.get('skip_validation'):
+                logger.warning(
+                    f'Dynaconf validation failed, continuing for the sake of unit tests\n{err}'
+                )
+            else:
+                raise err
         return settings
 
 
diff --git a/robottelo/config/validators.py b/robottelo/config/validators.py
index 2ae4c42ac04..12200c3644d 100644
--- a/robottelo/config/validators.py
+++ b/robottelo/config/validators.py
@@ -85,16 +85,6 @@
         Validator('capsule.deploy_workflows.os', must_exist=True),
         Validator('capsule.deploy_arguments', must_exist=True, is_type_of=dict, default={}),
     ],
-    certs=[
-        Validator(
-            'certs.cert_file',
-            'certs.key_file',
-            'certs.req_file',
-            'certs.ca_bundle_file',
-            must_exist=True,
-        )
-    ],
-    clients=[Validator('clients.provisioning_server')],
     libvirt=[
         Validator('libvirt.libvirt_hostname', must_exist=True),
         Validator('libvirt.libvirt_image_dir', default='/var/lib/libvirt/images'),
@@ -116,17 +106,6 @@
             must_exist=True,
         ),
     ],
-    discovery=[Validator('discovery.discovery_iso', must_exist=True)],
-    distro=[
-        Validator(
-            'distro.image_el7',
-            'distro.image_el6',
-            'distro.image_el8',
-            'distro.image_sles11',
-            'distro.image_sles12',
-            must_exist=True,
-        )
-    ],
     docker=[
         Validator(
             'docker.external_registry_1',
@@ -335,6 +314,9 @@
         Validator('remotedb.ssl', default=True),
         Validator('remotedb.port', default=5432),
     ],
+    robottelo=[
+        Validator('robottelo.settings.skip_validation', is_type_of=bool, default=False),
+    ],
     shared_function=[
         Validator('shared_function.storage', is_in=('file', 'redis'), default='file'),
         Validator('shared_function.share_timeout', lte=86400, default=86400),