diff --git a/userenvs/fedora38.json b/userenvs/fedora40.json
similarity index 96%
rename from userenvs/fedora38.json
rename to userenvs/fedora40.json
index 5e3d4a75..c161cc9f 100644
--- a/userenvs/fedora38.json
+++ b/userenvs/fedora40.json
@@ -5,11 +5,11 @@
     }
   },
   "userenv": {
-    "name": "fedora38",
-    "label": "Fedora 38",
+    "name": "fedora40",
+    "label": "Fedora 40",
     "origin": {
       "image": "registry.fedoraproject.org/fedora",
-      "tag": "38",
+      "tag": "40",
       "build-policy": "missing"
     },
     "properties": {
diff --git a/userenvs/fedora40/requirements/01-python.json b/userenvs/fedora40/requirements/01-python.json
new file mode 120000
index 00000000..6410858f
--- /dev/null
+++ b/userenvs/fedora40/requirements/01-python.json
@@ -0,0 +1 @@
+../../components/python310-pip3.json
\ No newline at end of file
diff --git a/userenvs/fedora40/requirements/02-core-utils.json b/userenvs/fedora40/requirements/02-core-utils.json
new file mode 120000
index 00000000..1fce36e9
--- /dev/null
+++ b/userenvs/fedora40/requirements/02-core-utils.json
@@ -0,0 +1 @@
+../../components/rpm-core-utils.json
\ No newline at end of file
diff --git a/userenvs/fedora40/requirements/03-core-compiling.json b/userenvs/fedora40/requirements/03-core-compiling.json
new file mode 120000
index 00000000..5bfe5c8e
--- /dev/null
+++ b/userenvs/fedora40/requirements/03-core-compiling.json
@@ -0,0 +1 @@
+../../components/rpm-core-compiling.json
\ No newline at end of file
diff --git a/userenvs/fedora40/requirements/04-core-perl.json b/userenvs/fedora40/requirements/04-core-perl.json
new file mode 120000
index 00000000..981ed34e
--- /dev/null
+++ b/userenvs/fedora40/requirements/04-core-perl.json
@@ -0,0 +1 @@
+../../components/core-perl.json
\ No newline at end of file
diff --git a/userenvs/fedora40/requirements/05-core-node.json b/userenvs/fedora40/requirements/05-core-node.json
new file mode 120000
index 00000000..bab0396c
--- /dev/null
+++ b/userenvs/fedora40/requirements/05-core-node.json
@@ -0,0 +1 @@
+../../components/core-node.json
\ No newline at end of file
diff --git a/userenvs/fedora40/schema.json b/userenvs/fedora40/schema.json
new file mode 120000
index 00000000..7b6727eb
--- /dev/null
+++ b/userenvs/fedora40/schema.json
@@ -0,0 +1 @@
+../components/schema.json
\ No newline at end of file
diff --git a/userenvs/fedora40/userenv.json b/userenvs/fedora40/userenv.json
new file mode 100644
index 00000000..04844624
--- /dev/null
+++ b/userenvs/fedora40/userenv.json
@@ -0,0 +1,23 @@
+  "userenv": {
+    "name": "fedora40",
+    "label": "Fedora 40",
+    "origin": {
+      "image": "registry.fedoraproject.org/fedora",
+      "tag": "40",
+      "build-policy": "missing"
+    },
+    "properties": {
+      "platform": [
+        {
+          "architecture": "x86_64"
+        },
+        {
+          "architecture": "aarch64"
+        }
+      ],
+      "packages": {
+        "type": "rpm",
+        "manager": "dnf"
+      }
+    }
+  },