diff --git a/README.md b/README.md
index 78a602ca..b60cc740 100644
--- a/README.md
+++ b/README.md
@@ -120,6 +120,11 @@ They can't capture all the project's features, but they are sufficient to get a
         <td><a href="https://github.com/kubernetes-sigs/external-dns">ExternalDNS</a></td>
         <td>Synchronizes exposed Kubernetes Services and Ingresses with DNS providers</td>
     </tr>
+    <tr>
+        <td><img width="32" src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/3f/Fedora_logo.svg/267px-Fedora_logo.svg.png"></td>
+        <td><a href="https://getfedora.org/en/server">Fedora Server</a></td>
+        <td>Base OS for Kubernetes nodes</td>
+    </tr>
     <tr>
         <td><img width="32" src="https://upload.wikimedia.org/wikipedia/commons/b/bb/Gitea_Logo.svg"></td>
         <td><a href="https://gitea.com">Gitea</a></td>
@@ -175,11 +180,6 @@ They can't capture all the project's features, but they are sufficient to get a
         <td><a href="https://www.whitesourcesoftware.com/free-developer-tools/renovate">Renovate</a></td>
         <td>Automatically update dependencies</td>
     </tr>
-    <tr>
-        <td><img width="32" src="https://avatars.githubusercontent.com/u/75713131?s=200&v=4"></td>
-        <td><a href="https://rockylinux.org">Rocky Linux</a></td>
-        <td>Base OS for Kubernetes nodes</td>
-    </tr>
     <tr>
         <td><img width="32" src="https://avatars.githubusercontent.com/u/47602533?s=200&v=4"></td>
         <td><a href="https://tekton.dev">Tekton</a></td>
diff --git a/docs/architecture/overview.md b/docs/architecture/overview.md
index d8a33412..e547933c 100644
--- a/docs/architecture/overview.md
+++ b/docs/architecture/overview.md
@@ -54,7 +54,7 @@ From now on, ArgoCD will do the rest:
 ```mermaid
 flowchart TD
   subgraph metal[./metal]
-    pxe[PXE Server] -.-> linux[Rocky Linux] --> k3s
+    pxe[PXE Server] -.-> linux[Fedora Server] --> k3s
   end
 
   subgraph bootstrap[./bootstrap]
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
index ff66cf7d..d21f38c8 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting.md
@@ -26,4 +26,4 @@ To view PXE server (includes DHCP, TFTP and HTTP server) logs:
 - Check if the operating system ISO file is mounted
 - Check the controller's firewall config
 - Check PXE server Docker logs
-- Check if the servers are booting to the correct OS (Rocky Linux installer instead of the previously installed OS), if not try to select it manually or remove the previous OS boot entry
+- Check if the servers are booting to the correct OS (Fedora Server installer instead of the previously installed OS), if not try to select it manually or remove the previous OS boot entry
diff --git a/metal/roles/pxe_server/defaults/main.yml b/metal/roles/pxe_server/defaults/main.yml
index 280e0401..465e4976 100644
--- a/metal/roles/pxe_server/defaults/main.yml
+++ b/metal/roles/pxe_server/defaults/main.yml
@@ -1,4 +1,4 @@
-iso_url: "https://download.rockylinux.org/pub/rocky/8.6/isos/x86_64/Rocky-8.6-x86_64-minimal.iso"
-iso_checksum: "sha256:a9ece0e810275e881abfd66bb0e59ac05d567a5ec0bc2f108b9a3e90bef5bf94"
+iso_url: "https://download.fedoraproject.org/pub/fedora/linux/releases/36/Server/x86_64/iso/Fedora-Server-dvd-x86_64-36-1.5.iso"
+iso_checksum: "sha256:5edaf708a52687b09f9810c2b6d2a3432edac1b18f4d8c908c0da6bde0379148"
 timezone: Asia/Ho_Chi_Minh
 dhcp_proxy: true
diff --git a/metal/roles/pxe_server/templates/kickstart.ks.j2 b/metal/roles/pxe_server/templates/kickstart.ks.j2
index cd029c95..887ae180 100644
--- a/metal/roles/pxe_server/templates/kickstart.ks.j2
+++ b/metal/roles/pxe_server/templates/kickstart.ks.j2
@@ -19,7 +19,7 @@ partition / --fstype=ext4 --grow
 network --bootproto=static --device={{ hostvars[item]['network_interface'] }} --ip={{ hostvars[item]['ansible_host'] }} --gateway={{ ansible_default_ipv4.gateway }} --nameserver={{ dns_server }} --netmask={{ ansible_default_ipv4.netmask }} --ipv6=auto --hostname={{ hostvars[item]['inventory_hostname'] }} --activate
 
 # Use network installation
-repo --name="Minimal" --baseurl=http://{{ ansible_default_ipv4.address }}/os/Minimal
+repo --name="Repository" --baseurl=http://{{ ansible_default_ipv4.address }}/os
 url --url="http://{{ ansible_default_ipv4.address }}/os"
 # Disable Setup Agent on first boot
 firstboot --disable
@@ -28,7 +28,7 @@ skipx
 # Enable NTP
 services --enabled="chronyd"
 # System timezone
-timezone {{ timezone }} --isUtc
+timezone {{ timezone }} --utc
 
 # Create user (locked by default)
 user --groups=wheel --name=admin
@@ -44,7 +44,8 @@ selinux --disabled
 firewall --disabled
 
 %packages
-@^minimal-environment
+@^custom-environment
+@headless-management
 iscsi-initiator-utils
 %end