diff --git a/sdcm/cluster.py b/sdcm/cluster.py
index c058f13d9f..0500a80c1b 100644
--- a/sdcm/cluster.py
+++ b/sdcm/cluster.py
@@ -2043,7 +2043,7 @@ def offline_install_scylla(self, unified_package, nonroot):
             self.install_package(package_name='python2')
         # Offline install does't provide openjdk-11, it has to be installed in advance
         # https://github.com/scylladb/scylla-jmx/issues/127
-        elif self.distro.is_amazon2023:
+        if self.distro.is_amazon2023:
             self.install_package(package_name="java-11-amazon-corretto-headless")
         elif self.distro.is_rhel_like:
             self.install_package(package_name='java-11-openjdk-headless tar')
diff --git a/utils/scylla_doctor.py b/utils/scylla_doctor.py
index 0991f5c60f..eb6d7b0d3b 100644
--- a/utils/scylla_doctor.py
+++ b/utils/scylla_doctor.py
@@ -114,8 +114,8 @@ def filter_out_failed_collectors(self, collector):
             return True
 
         # https://github.com/scylladb/scylladb/issues/18631
-        if collector in ["CPUSetCollector", "PerftuneSystemConfigurationCollector"]:
-            return True
+        # if self.node.distro.is_amazon2 and collector in ["CPUSetCollector", "PerftuneSystemConfigurationCollector"]:
+        #    return True
 
         return False