diff --git a/fedora-next.repo b/fedora-next.repo
index a7bb4a23d5..b7cc9bc78d 100644
--- a/fedora-next.repo
+++ b/fedora-next.repo
@@ -37,40 +37,3 @@ gpgcheck=1
 metadata_expire=6h
 gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
 skip_if_unavailable=False
-
-[fedora-next-modular]
-name=Fedora Modular $releasever - $basearch
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/development/$releasever/Modular/$basearch/os/
-        https://dl.fedoraproject.org/pub/fedora-secondary/development/$releasever/Modular/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
-enabled=1
-#metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-next-updates-modular]
-name=Fedora Modular $releasever - $basearch - Updates
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
-        https://dl.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
-enabled=1
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-next-updates-testing-modular]
-name=Fedora Modular $releasever - $basearch - Test Updates
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
-        https://dl.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/Modular/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-enabled=1
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-skip_if_unavailable=False
diff --git a/fedora.repo b/fedora.repo
index c4bc1c81bd..4b1fdd7f99 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -37,40 +37,3 @@ gpgcheck=1
 metadata_expire=6h
 gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
 skip_if_unavailable=False
-
-[fedora-modular]
-name=Fedora Modular $releasever - $basearch
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Modular/$basearch/os/
-        https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Modular/$basearch/os/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-modular-$releasever&arch=$basearch
-enabled=1
-#metadata_expire=7d
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-updates-modular]
-name=Fedora Modular $releasever - $basearch - Updates
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/Modular/$basearch/
-        https://dl.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Modular/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-modular-f$releasever&arch=$basearch
-enabled=1
-repo_gpgcheck=0
-type=rpm
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-updates-testing-modular]
-name=Fedora Modular $releasever - $basearch - Test Updates
-baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/Modular/$basearch/
-        https://dl.fedoraproject.org/pub/fedora-secondary/updates/testing/$releasever/Modular/$basearch/
-#metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-enabled=1
-gpgcheck=1
-metadata_expire=6h
-gpgkey=file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary
-skip_if_unavailable=False
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index a6c8971999..f079abec26 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -41,6 +41,11 @@ conditional-include:
       - releasever == 38
     # Remove qcom dtb on F38 files since autopruning isn't in place yet
     include: aarch64-drop-qcom-dtb-files.yaml
+  - if:
+      - releasever == 38
+    # Modularity is going away in F39+ so we'll only include
+    # the fedora-repos-modular package in <39.
+    include: fedora-repos-modular.yaml
 
 ostree-layers:
   - overlay/15fcos
@@ -55,9 +60,6 @@ lockfile-repos:
 packages:
   - fedora-release-coreos
   - fedora-repos-ostree
-  # fedora-repos-modular was converted into its own subpackage in f33
-  # Continue to include it in case users want to use it.
-  - fedora-repos-modular
   # the archive repo for more reliable package layering
   # https://github.com/coreos/fedora-coreos-tracker/issues/400
   - fedora-repos-archive
diff --git a/manifests/fedora-repos-modular.yaml b/manifests/fedora-repos-modular.yaml
new file mode 100644
index 0000000000..ac2ed6cdff
--- /dev/null
+++ b/manifests/fedora-repos-modular.yaml
@@ -0,0 +1,4 @@
+# Modularity is going away in F39+ so we'll only include
+# the fedora-repos-modular package in <39.
+packages:
+  - fedora-repos-modular
diff --git a/tests/kola/extensions/module b/tests/kola/extensions/module
deleted file mode 100755
index acdab024c5..0000000000
--- a/tests/kola/extensions/module
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-## kola:
-##   tags: "platform-independent needs-internet"
-##   # This test only runs on FCOS as OS extensions are implemented differently on RHCOS.
-##   distros: fcos
-##   # This is dependent on network and disk speed but we've seen the
-##   # test take longer than 10 minutes in our aarch64 qemu tests.
-##   timeoutMin: 15
-##   minMemory: 1536
-##   description: Verify that we can install some common tools via module 
-##     as OS extensions.
-
-set -xeuo pipefail
-
-. $KOLA_EXT_DATA/commonlib.sh
-
-# Note: This version must be kept up to date for now, since there currently is no 'latest' (or similar) stream
-CRIO_VERSION=1.24
-
-declare -A commands=(
-  ["cri-o:${CRIO_VERSION}/default"]="crio"
-  ["nginx:mainline"]="nginx"
-)
-
-rpm-ostree ex module install "${!commands[@]}"
-rpm-ostree ex apply-live
-
-failed=""
-
-for m in "${!commands[@]}"; do
-  if [[ -z "$(command -v "${commands[$m]}")" ]]; then
-    echo "Could not find: ${commands[$m]}"
-    failed+=" ${1}"
-  fi
-done
-
-if [[ -n "${failed}" ]]; then
-  fatal "could not install: ${failed}"
-fi
-ok "successfully installed os rpm module extensions"
diff --git a/tests/kola/extensions/package b/tests/kola/extensions/package
index 3d2f709580..48cc995fbb 100755
--- a/tests/kola/extensions/package
+++ b/tests/kola/extensions/package
@@ -19,6 +19,7 @@ commands=(
   'strace'
   'tcpdump'
   'tree'
+  'crio'
 )
 
 # Also try some OS extensions which have host bindings. These can only