diff --git a/perl-CGI.yaml b/perl-CGI.yaml
index 02899f1..2e41e4d 100644
--- a/perl-CGI.yaml
+++ b/perl-CGI.yaml
@@ -52,6 +52,18 @@ data:
               rpms:
                   macros: |
                       %_without_perl_CGI_enables_optional_test 1
+        - context: 'f38p534'
+          platform: f38
+          buildrequires:
+              perl: ['5.34']
+              perl-libwww-perl: ['6.62']
+          requires:
+              perl: ['5.34']
+              perl-libwww-perl: ['6.62']
+          buildopts:
+              rpms:
+                  macros: |
+                      %_without_perl_CGI_enables_optional_test 1
         - context: 'f35p536'
           platform: f35
           buildrequires:
@@ -88,6 +100,114 @@ data:
               rpms:
                   macros: |
                       %_without_perl_CGI_enables_optional_test 1
+        - context: 'f38p536'
+          platform: f38
+          buildrequires:
+              perl: ['5.36']
+              perl-libwww-perl: ['6.62']
+          requires:
+              perl: ['5.36']
+              perl-libwww-perl: ['6.62']
+          buildopts:
+              rpms:
+                  macros: |
+                      %_without_perl_CGI_enables_optional_test 1
+        - context: '1f35p534'
+          platform: f35
+          buildrequires:
+              perl: ['5.34']
+              perl-libwww-perl: ['6.67']
+          requires:
+              perl: ['5.34']
+              perl-libwww-perl: ['6.67']
+          buildopts:
+              rpms:
+                  macros: |
+                      %_without_perl_CGI_enables_optional_test 1
+        - context: '1f36p534'
+          platform: f36
+          buildrequires:
+              perl: ['5.34']
+              perl-libwww-perl: ['6.67']
+          requires:
+              perl: ['5.34']
+              perl-libwww-perl: ['6.67']
+          buildopts:
+              rpms:
+                  macros: |
+                      %_without_perl_CGI_enables_optional_test 1
+        - context: '1f37p534'
+          platform: f37
+          buildrequires:
+              perl: ['5.34']
+              perl-libwww-perl: ['6.67']
+          requires:
+              perl: ['5.34']
+              perl-libwww-perl: ['6.67']
+          buildopts:
+              rpms:
+                  macros: |
+                      %_without_perl_CGI_enables_optional_test 1
+        - context: '1f38p534'
+          platform: f38
+          buildrequires:
+              perl: ['5.34']
+              perl-libwww-perl: ['6.67']
+          requires:
+              perl: ['5.34']
+              perl-libwww-perl: ['6.67']
+          buildopts:
+              rpms:
+                  macros: |
+                      %_without_perl_CGI_enables_optional_test 1
+        - context: '1f35p536'
+          platform: f35
+          buildrequires:
+              perl: ['5.36']
+              perl-libwww-perl: ['6.67']
+          requires:
+              perl: ['5.36']
+              perl-libwww-perl: ['6.67']
+          buildopts:
+              rpms:
+                  macros: |
+                      %_without_perl_CGI_enables_optional_test 1
+        - context: '1f36p536'
+          platform: f36
+          buildrequires:
+              perl: ['5.36']
+              perl-libwww-perl: ['6.67']
+          requires:
+              perl: ['5.36']
+              perl-libwww-perl: ['6.67']
+          buildopts:
+              rpms:
+                  macros: |
+                      %_without_perl_CGI_enables_optional_test 1
+        - context: '1f37p536'
+          platform: f37
+          buildrequires:
+              perl: ['5.36']
+              perl-libwww-perl: ['6.67']
+          requires:
+              perl: ['5.36']
+              perl-libwww-perl: ['6.67']
+          buildopts:
+              rpms:
+                  macros: |
+                      %_without_perl_CGI_enables_optional_test 1
+        - context: '1f38p536'
+          platform: f38
+          buildrequires:
+              perl: ['5.36']
+              perl-libwww-perl: ['6.67']
+          requires:
+              perl: ['5.36']
+              perl-libwww-perl: ['6.67']
+          buildopts:
+              rpms:
+                  macros: |
+                      %_without_perl_CGI_enables_optional_test 1
     references:
         community: https://metacpan.org/release/CGI
     profiles:
@@ -108,20 +228,20 @@ data:
         rpms:
             perl-Sub-Uplevel:
                 rationale: A build-time dependency.
-                ref: rawhide
+                ref: f37
                 buildonly: true
                 buildorder: 0
             perl-Test-Deep:
                 rationale: A build-time dependency.
-                ref: rawhide
+                ref: f37
                 buildonly: true
                 buildorder: 0
             perl-Test-Warn:
                 rationale: A build-time dependency.
-                ref: rawhide
+                ref: f37
                 buildonly: true
                 buildorder: 1
             perl-CGI:
                 rationale: The API.
-                ref: rawhide
+                ref: f37
                 buildorder: 2