diff --git a/init/eessi_environment_variables b/init/eessi_environment_variables
index 60d69cc198..0f13b1493a 100644
--- a/init/eessi_environment_variables
+++ b/init/eessi_environment_variables
@@ -87,16 +87,6 @@ if [ -d $EESSI_PREFIX ]; then
     fi
     if [ ! -z $EESSI_SOFTWARE_SUBDIR ]; then
 
-        # use x86_64/amd/zen3 for now when AMD Genoa (Zen4) CPU is detected,
-        # since optimized software installations for Zen4 are a work-in-progress,
-        # see https://gitlab.com/eessi/support/-/issues/37
-        if [[ "${EESSI_SOFTWARE_SUBDIR}" == "x86_64/amd/zen4" ]]; then
-            if [ -z $EESSI_SOFTWARE_SUBDIR_OVERRIDE ]; then
-                export EESSI_SOFTWARE_SUBDIR="x86_64/amd/zen3"
-                echo -e "\e[33mSticking to ${EESSI_SOFTWARE_SUBDIR} for now, since optimized installations for AMD Genoa (Zen4) are a work in progress, see https://gitlab.com/eessi/support/-/issues/37 for more information\e[0m"
-            fi
-        fi
-
         show_msg "Using ${EESSI_SOFTWARE_SUBDIR} as software subdirectory."
         export EESSI_SOFTWARE_PATH=$EESSI_PREFIX/software/$EESSI_OS_TYPE/$EESSI_SOFTWARE_SUBDIR
 
diff --git a/init/modules/EESSI/2023.06.lua b/init/modules/EESSI/2023.06.lua
index eb1cd1753b..d5105e89fc 100644
--- a/init/modules/EESSI/2023.06.lua
+++ b/init/modules/EESSI/2023.06.lua
@@ -49,15 +49,6 @@ function archdetect_cpu()
         -- We loop over the list, and return the highest matching arch for which a directory exists for this EESSI version
         for archdetect_filter_cpu in string.gmatch(archdetect_options, "([^" .. ":" .. "]+)") do
             if isDir(pathJoin(eessi_prefix, "software", eessi_os_type, archdetect_filter_cpu, "software")) then
-                -- use x86_64/amd/zen3 for now when AMD Genoa (Zen4) CPU is detected,
-                -- since optimized software installations for Zen4 are a work-in-progress,
-                -- see https://gitlab.com/eessi/support/-/issues/37
-                if (archdetect_filter_cpu == "x86_64/amd/zen4" and not os.getenv("EESSI_SOFTWARE_SUBDIR_OVERRIDE") == "x86_64/amd/zen4") then
-                    archdetect_filter_cpu = "x86_64/amd/zen3"
-                    if mode() == "load" then
-                        LmodMessage("Sticking to " .. archdetect_filter_cpu .. " for now, since optimized installations for AMD Genoa (Zen4) are a work in progress.")
-                    end
-                end
                 eessiDebug("Selected archdetect CPU: " .. archdetect_filter_cpu)
                 return archdetect_filter_cpu
             end