diff --git a/css/main.css b/css/main.css
index 1b56319..93cbe66 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1521,7 +1521,7 @@ strong {
 .client .btn.client-distro,
 .server .btn.server-distro,
 .install .server-auto .btn.server-region {
-  min-width: 135px;
+  min-width: 150px;
   display: inline-block;
   margin: 10px;
   font-size: 16px;
diff --git a/index.html b/index.html
index 55f71a5..0e74f83 100644
--- a/index.html
+++ b/index.html
@@ -745,7 +745,7 @@ <h2 class="title text-center">Install</h2>
         </div>
         <div
           class="distro-btns item col-md-6 col-sm-12 col-xs-12 col-md-offset-3">
-          <button class="server-distro server-archlinux btn btn-lg btn-primary">Arch Linux</button><button class="server-distro server-amazon-linux-two btn btn-lg btn-default">AmazonLinux 2</button><button class="server-distro server-centos-7 btn btn-lg btn-default">CentOS 7</button><button class="server-distro server-centos-8 btn btn-lg btn-default">CentOS 8</button><button class="server-distro server-debian-stretch btn btn-lg btn-default">Debian 10</button><button class="server-distro server-oracle-linux-7 btn btn-lg btn-default">Oracle Linux 7</button><button class="server-distro server-oracle-linux-8 btn btn-lg btn-default">Oracle Linux 8</button><button class="server-distro server-ubuntu-one btn btn-lg btn-default">Ubuntu 20.04</button><button class="server-distro server-ubuntu-two btn btn-lg btn-default">Ubuntu 22.04</button>
+          <button class="server-distro server-archlinux btn btn-lg btn-primary">Arch Linux</button><button class="server-distro server-amazon-linux-two btn btn-lg btn-default">AmazonLinux 2023</button><button class="server-distro server-centos-7 btn btn-lg btn-default">AlmaLinux 8</button><button class="server-distro server-centos-8 btn btn-lg btn-default">AlmaLinux 9</button><button class="server-distro server-debian-stretch btn btn-lg btn-default">Debian 12</button><button class="server-distro server-oracle-linux-7 btn btn-lg btn-default">Oracle Linux 8</button><button class="server-distro server-oracle-linux-8 btn btn-lg btn-default">Oracle Linux 9</button><button class="server-distro server-ubuntu-one btn btn-lg btn-default">Ubuntu 22.04</button><button class="server-distro server-ubuntu-two btn btn-lg btn-default">Ubuntu 24.04</button>
         </div>
         <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-archlinux">
           <h3 class="title text-center">Arch Linux</h3>
@@ -757,200 +757,233 @@ <h3 class="title text-center">Arch Linux</h3>
 sudo pacman-key --keyserver hkp://keyserver.ubuntu.com -r 7568D9BB55FF9E5287D586017AE645C0CF8E292A
 sudo pacman-key --lsign-key 7568D9BB55FF9E5287D586017AE645C0CF8E292A
 sudo pacman -Sy
-sudo pacman -S --noconfirm pritunl
+sudo pacman -S --noconfirm pritunl openvpn
 sudo systemctl start mongodb pritunl
 sudo systemctl enable mongodb pritunl</textarea>
         </div>
         <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-amazon-linux-two">
-          <h3 class="title text-center">AmazonLinux 2</h3>
-          <textarea class="editor bash">sudo tee /etc/yum.repos.d/mongodb-org-6.0.repo &lt;&lt; EOF
-[mongodb-org-6.0]
+          <h3 class="title text-center">AmazonLinux 2023</h3>
+          <textarea class="editor bash">sudo tee /etc/yum.repos.d/mongodb-org.repo &lt;&lt; EOF
+[mongodb-org]
 name=MongoDB Repository
-baseurl=https://repo.mongodb.org/yum/amazon/2/mongodb-org/6.0/x86_64/
+baseurl=https://repo.mongodb.org/yum/amazon/2023/mongodb-org/7.0/x86_64/
 gpgcheck=1
 enabled=1
-gpgkey=https://www.mongodb.org/static/pgp/server-6.0.asc
+gpgkey=https://www.mongodb.org/static/pgp/server-7.0.asc
 EOF
 
 sudo tee /etc/yum.repos.d/pritunl.repo &lt;&lt; EOF
 [pritunl]
 name=Pritunl Repository
-baseurl=https://repo.pritunl.com/stable/yum/amazonlinux/2/
+baseurl=https://repo.pritunl.com/stable/yum/amazonlinux/2023/
 gpgcheck=1
 enabled=1
+gpgkey=https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc
 EOF
 
-sudo rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A > key.tmp; sudo rpm --import key.tmp; rm -f key.tmp
-sudo yum -y install pritunl mongodb-org
+sudo yum -y remove iptables-services
+sudo systemctl stop firewalld.service
+sudo systemctl disable firewalld.service
+
+sudo dnf -y install epel-release
+sudo dnf -y install pritunl mongodb-org pritunl-openvpn
 sudo systemctl start mongod pritunl
 sudo systemctl enable mongod pritunl</textarea>
         </div>
         <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-centos-7">
-          <h3 class="title text-center">CentOS 7</h3>
-          <textarea class="editor bash">sudo tee /etc/yum.repos.d/mongodb-org-6.0.repo &lt;&lt; EOF
-[mongodb-org-6.0]
+          <h3 class="title text-center">AlmaLinux 8</h3>
+          <textarea class="editor bash">sudo tee /etc/yum.repos.d/mongodb-org.repo &lt;&lt; EOF
+[mongodb-org]
 name=MongoDB Repository
-baseurl=https://repo.mongodb.org/yum/redhat/7/mongodb-org/6.0/x86_64/
+baseurl=https://repo.mongodb.org/yum/redhat/8/mongodb-org/7.0/x86_64/
 gpgcheck=1
 enabled=1
-gpgkey=https://www.mongodb.org/static/pgp/server-6.0.asc
+gpgkey=https://www.mongodb.org/static/pgp/server-7.0.asc
 EOF
 
 sudo tee /etc/yum.repos.d/pritunl.repo &lt;&lt; EOF
 [pritunl]
 name=Pritunl Repository
-baseurl=https://repo.pritunl.com/stable/yum/oraclelinux/7/
+baseurl=https://repo.pritunl.com/stable/yum/almalinux/8/
 gpgcheck=1
 enabled=1
+gpgkey=https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc
 EOF
 
-sudo rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A > key.tmp; sudo rpm --import key.tmp; rm -f key.tmp
-sudo yum -y install pritunl mongodb-org
+sudo yum -y remove iptables-services
+sudo systemctl stop firewalld.service
+sudo systemctl disable firewalld.service
+
+sudo dnf -y install epel-release
+sudo dnf -y install pritunl mongodb-org pritunl-openvpn
 sudo systemctl start mongod pritunl
 sudo systemctl enable mongod pritunl</textarea>
         </div>
         <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-centos-8">
-          <h3 class="title text-center">CentOS 8</h3>
-          <textarea class="editor bash">sudo tee /etc/yum.repos.d/mongodb-org-6.0.repo &lt;&lt; EOF
-[mongodb-org-6.0]
+          <h3 class="title text-center">AlmaLinux 9</h3>
+          <textarea class="editor bash">sudo tee /etc/yum.repos.d/mongodb-org.repo &lt;&lt; EOF
+[mongodb-org]
 name=MongoDB Repository
-baseurl=https://repo.mongodb.org/yum/redhat/8/mongodb-org/6.0/x86_64/
+baseurl=https://repo.mongodb.org/yum/redhat/9/mongodb-org/7.0/x86_64/
 gpgcheck=1
 enabled=1
-gpgkey=https://www.mongodb.org/static/pgp/server-6.0.asc
+gpgkey=https://www.mongodb.org/static/pgp/server-7.0.asc
 EOF
 
 sudo tee /etc/yum.repos.d/pritunl.repo &lt;&lt; EOF
 [pritunl]
 name=Pritunl Repository
-baseurl=https://repo.pritunl.com/stable/yum/oraclelinux/8/
+baseurl=https://repo.pritunl.com/stable/yum/almalinux/9/
 gpgcheck=1
 enabled=1
+gpgkey=https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc
 EOF
 
-sudo yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A > key.tmp; sudo rpm --import key.tmp; rm -f key.tmp
-sudo yum -y install pritunl mongodb-org
+sudo yum -y remove iptables-services
+sudo systemctl stop firewalld.service
+sudo systemctl disable firewalld.service
+
+sudo dnf -y install epel-release
+sudo dnf -y install pritunl mongodb-org pritunl-openvpn wireguard-tools
 sudo systemctl start mongod pritunl
 sudo systemctl enable mongod pritunl</textarea>
         </div>
         <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-debian-stretch">
-          <h3 class="title text-center">Debian Buster</h3>
-          <textarea class="editor bash">sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list &lt;&lt; EOF
-deb https://repo.mongodb.org/apt/debian buster/mongodb-org/6.0 main
+          <h3 class="title text-center">Debian Bookworm</h3>
+          <textarea class="editor bash">sudo tee /etc/apt/sources.list.d/mongodb-org.list &lt;&lt; EOF
+deb [ signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu bookworm/mongodb-org/7.0 multiverse
+EOF
+
+sudo tee /etc/apt/sources.list.d/openvpn.list &lt;&lt; EOF
+deb [ signed-by=/usr/share/keyrings/openvpn-repo.gpg ] https://build.openvpn.net/debian/openvpn/stable bookworm main
 EOF
 
 sudo tee /etc/apt/sources.list.d/pritunl.list &lt;&lt; EOF
-deb https://repo.pritunl.com/stable/apt buster main
+deb [ signed-by=/usr/share/keyrings/pritunl.gpg ] https://repo.pritunl.com/stable/apt bookworm main
 EOF
 
 sudo apt --assume-yes install gnupg
-wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | sudo apt-key add -
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com --recv 7568D9BB55FF9E5287D586017AE645C0CF8E292A
+curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg --dearmor --yes
+curl -fsSL https://swupdate.openvpn.net/repos/repo-public.gpg | sudo gpg -o /usr/share/keyrings/openvpn-repo.gpg --dearmor --yes
+curl -fsSL https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc | sudo gpg -o /usr/share/keyrings/pritunl.gpg --dearmor --yes
+
+sudo ufw disable
 sudo apt update
-sudo apt --assume-yes install pritunl mongodb-org
+sudo apt --assume-yes install pritunl mongodb-org wireguard-tools
 sudo systemctl start mongod pritunl
 sudo systemctl enable mongod pritunl</textarea>
         </div>
         <div
           class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-oracle-linux-7">
-          <h3 class="title text-center">Oracle Linux 7</h3>
-          <textarea class="editor bash">sudo tee /etc/yum.repos.d/mongodb-org-6.0.repo &lt;&lt; EOF
-[mongodb-org-6.0]
+          <h3 class="title text-center">Oracle Linux 8</h3>
+          <textarea class="editor bash">sudo tee /etc/yum.repos.d/mongodb-org.repo &lt;&lt; EOF
+[mongodb-org]
 name=MongoDB Repository
-baseurl=https://repo.mongodb.org/yum/redhat/7/mongodb-org/6.0/x86_64/
+baseurl=https://repo.mongodb.org/yum/redhat/8/mongodb-org/7.0/x86_64/
 gpgcheck=1
 enabled=1
-gpgkey=https://www.mongodb.org/static/pgp/server-6.0.asc
+gpgkey=https://www.mongodb.org/static/pgp/server-7.0.asc
 EOF
 
 sudo tee /etc/yum.repos.d/pritunl.repo &lt;&lt; EOF
 [pritunl]
 name=Pritunl Repository
-baseurl=https://repo.pritunl.com/stable/yum/oraclelinux/7/
+baseurl=https://repo.pritunl.com/stable/yum/oraclelinux/8/
 gpgcheck=1
 enabled=1
+gpgkey=https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc
 EOF
 
-sudo yum -y install oracle-epel-release-el7
-sudo yum-config-manager --enable ol7_developer_epel
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A > key.tmp; sudo rpm --import key.tmp; rm -f key.tmp
-sudo yum -y install pritunl mongodb-org
+sudo yum -y remove iptables-services
+sudo systemctl stop firewalld.service
+sudo systemctl disable firewalld.service
+
+sudo dnf -y install epel-release
+sudo dnf -y install pritunl mongodb-org pritunl-openvpn
 sudo systemctl start mongod pritunl
 sudo systemctl enable mongod pritunl</textarea>
         </div>
         <div
           class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-oracle-linux-8">
-          <h3 class="title text-center">Oracle Linux 8</h3>
-          <textarea class="editor bash">sudo tee /etc/yum.repos.d/mongodb-org-6.0.repo &lt;&lt; EOF
-[mongodb-org-6.0]
+          <h3 class="title text-center">Oracle Linux 9</h3>
+          <textarea class="editor bash">sudo tee /etc/yum.repos.d/mongodb-org.repo &lt;&lt; EOF
+[mongodb-org]
 name=MongoDB Repository
-baseurl=https://repo.mongodb.org/yum/redhat/8/mongodb-org/6.0/x86_64/
+baseurl=https://repo.mongodb.org/yum/redhat/9/mongodb-org/7.0/x86_64/
 gpgcheck=1
 enabled=1
-gpgkey=https://www.mongodb.org/static/pgp/server-6.0.asc
+gpgkey=https://www.mongodb.org/static/pgp/server-7.0.asc
 EOF
 
 sudo tee /etc/yum.repos.d/pritunl.repo &lt;&lt; EOF
 [pritunl]
 name=Pritunl Repository
-baseurl=https://repo.pritunl.com/stable/yum/oraclelinux/8/
+baseurl=https://repo.pritunl.com/stable/yum/oraclelinux/9/
 gpgcheck=1
 enabled=1
+gpgkey=https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc
 EOF
 
-sudo yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A > key.tmp; sudo rpm --import key.tmp; rm -f key.tmp
-sudo yum -y install pritunl mongodb-org
+sudo yum -y remove iptables-services
+sudo systemctl stop firewalld.service
+sudo systemctl disable firewalld.service
+
+sudo dnf -y install epel-release
+sudo dnf -y install pritunl mongodb-org pritunl-openvpn wireguard-tools
 sudo systemctl start mongod pritunl
 sudo systemctl enable mongod pritunl</textarea>
         </div>
         <div
           class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-ubuntu-one">
-          <h3 class="title text-center">Ubuntu Focal</h3>
-          <textarea class="editor bash">sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list &lt;&lt; EOF
-deb https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/6.0 multiverse
+          <h3 class="title text-center">Ubuntu Jammy</h3>
+          <textarea class="editor bash">sudo tee /etc/apt/sources.list.d/mongodb-org.list &lt;&lt; EOF
+deb [ signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse
+EOF
+
+sudo tee /etc/apt/sources.list.d/openvpn.list &lt;&lt; EOF
+deb [ signed-by=/usr/share/keyrings/openvpn-repo.gpg ] https://build.openvpn.net/debian/openvpn/stable jammy main
 EOF
 
 sudo tee /etc/apt/sources.list.d/pritunl.list &lt;&lt; EOF
-deb https://repo.pritunl.com/stable/apt focal main
+deb [ signed-by=/usr/share/keyrings/pritunl.gpg ] https://repo.pritunl.com/stable/apt jammy main
 EOF
 
 sudo apt --assume-yes install gnupg
-wget -qO- https://www.mongodb.org/static/pgp/server-6.0.asc | sudo tee /etc/apt/trusted.gpg.d/mongodb-org-6.0.asc
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A | sudo tee /etc/apt/trusted.gpg.d/pritunl.asc
+curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg --dearmor --yes
+curl -fsSL https://swupdate.openvpn.net/repos/repo-public.gpg | sudo gpg -o /usr/share/keyrings/openvpn-repo.gpg --dearmor --yes
+curl -fsSL https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc | sudo gpg -o /usr/share/keyrings/pritunl.gpg --dearmor --yes
+
+sudo ufw disable
 sudo apt update
-sudo apt --assume-yes install pritunl mongodb-org
-sudo systemctl start pritunl mongod
-sudo systemctl enable pritunl mongod</textarea>
+sudo apt --assume-yes install pritunl mongodb-org wireguard-tools
+sudo systemctl start mongod pritunl
+sudo systemctl enable mongod pritunl</textarea>
         </div>
         <div
           class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-ubuntu-two">
-          <h3 class="title text-center">Ubuntu Jammy</h3>
-          <textarea class="editor bash">sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list &lt;&lt; EOF
-deb https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/6.0 multiverse
+          <h3 class="title text-center">Ubuntu Noble</h3>
+          <textarea class="editor bash">sudo tee /etc/apt/sources.list.d/mongodb-org.list &lt;&lt; EOF
+deb [ signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/7.0 multiverse
+EOF
+
+sudo tee /etc/apt/sources.list.d/openvpn.list &lt;&lt; EOF
+deb [ signed-by=/usr/share/keyrings/openvpn-repo.gpg ] https://build.openvpn.net/debian/openvpn/stable noble main
 EOF
 
 sudo tee /etc/apt/sources.list.d/pritunl.list &lt;&lt; EOF
-deb https://repo.pritunl.com/stable/apt jammy main
+deb [ signed-by=/usr/share/keyrings/pritunl.gpg ] https://repo.pritunl.com/unstable/apt noble main
 EOF
 
 sudo apt --assume-yes install gnupg
-wget -qO- https://www.mongodb.org/static/pgp/server-6.0.asc | sudo tee /etc/apt/trusted.gpg.d/mongodb-org-6.0.asc
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A | sudo tee /etc/apt/trusted.gpg.d/pritunl.asc
+curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg --dearmor --yes
+curl -fsSL https://swupdate.openvpn.net/repos/repo-public.gpg | sudo gpg -o /usr/share/keyrings/openvpn-repo.gpg --dearmor --yes
+curl -fsSL https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc | sudo gpg -o /usr/share/keyrings/pritunl.gpg --dearmor --yes
+
+sudo ufw disable
 sudo apt update
-sudo apt --assume-yes install pritunl mongodb-org
-sudo systemctl start pritunl mongod
-sudo systemctl enable pritunl mongod</textarea>
+sudo apt --assume-yes install pritunl mongodb-org wireguard-tools
+sudo systemctl start mongod pritunl
+sudo systemctl enable mongod pritunl</textarea>
         </div>
       </div>
     </div>
@@ -970,7 +1003,7 @@ <h2 class="title text-center">Open Source OpenVPN and WireGuard Client</h2>
         </div>
         <div class="distro-btns item col-md-6 col-sm-12 col-xs-12 col-md-offset-3">
           <h3 class="title text-center">Linux</h3>
-          <button class="client-distro client-archlinux btn btn-lg btn-primary">Arch Linux</button><button class="client-distro client-centos-7 btn btn-lg btn-default">AlmaLinux 9</button><button class="client-distro client-debian-stretch btn btn-lg btn-default">Debian 10</button><button class="client-distro client-other btn btn-lg btn-default">Oracle Linux 9</button><button class="client-distro client-fedora btn btn-lg btn-default">Fedora 39</button><button class="client-distro client-ubuntu-one btn btn-lg btn-default" style="display: none !important">Ubuntu 22.04</button><button class="client-distro client-ubuntu-two btn btn-lg btn-default">Ubuntu 23.10</button><button class="client-distro client-ubuntu-three btn btn-lg btn-default">Ubuntu 24.04</button>
+          <button class="client-distro client-archlinux btn btn-lg btn-primary">Arch Linux</button><button class="client-distro client-centos-7 btn btn-lg btn-default">AlmaLinux 9</button><button class="client-distro client-debian-stretch btn btn-lg btn-default">Debian 10</button><button class="client-distro client-other btn btn-lg btn-default">Oracle Linux 9</button><button class="client-distro client-fedora btn btn-lg btn-default">Fedora 40</button><button class="client-distro client-ubuntu-one btn btn-lg btn-default" style="display: none !important">Ubuntu 22.04</button><button class="client-distro client-ubuntu-two btn btn-lg btn-default">Ubuntu 23.10</button><button class="client-distro client-ubuntu-three btn btn-lg btn-default">Ubuntu 24.04</button>
         </div>
         <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-archlinux">
           <h3 class="title text-center">Arch Linux</h3>
@@ -984,42 +1017,27 @@ <h3 class="title text-center">Arch Linux</h3>
 sudo pacman -Sy
 sudo pacman -S pritunl-client-electron</textarea>
         </div>
-        <div class="item col-md-5 col-sm-12 col-xs-12 col-md-offset-1 install-centos-7">
+        <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-centos-7">
           <h3 class="title text-center">AlmaLinux 9</h3>
           <textarea class="editor bash">sudo tee /etc/yum.repos.d/pritunl.repo &lt;&lt; EOF
 [pritunl]
-name=Pritunl Stable Repository
-baseurl=https://repo.pritunl.com/stable/yum/almalinux/9/
-gpgcheck=1
-enabled=1
-EOF
-
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A > key.tmp; sudo rpm --import key.tmp; rm -f key.tmp
-sudo yum install pritunl-client-electron</textarea>
-        </div>
-        <div class="item col-md-5 col-sm-12 col-xs-12 install-centos-7">
-          <h3 class="title text-center">Amazon Linux 2</h3>
-          <textarea class="editor bash">sudo tee /etc/yum.repos.d/pritunl.repo &lt;&lt; EOF
-[pritunl]
-name=Pritunl Stable Repository
-baseurl=https://repo.pritunl.com/stable/yum/amazonlinux/2/
+name=Pritunl Repository
+baseurl=https://repo.pritunl.com/stable/yum/alamlinux/9/
 gpgcheck=1
 enabled=1
+gpgkey=https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc
 EOF
 
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A > key.tmp; sudo rpm --import key.tmp; rm -f key.tmp
-sudo yum install pritunl-client-electron</textarea>
+sudo dnf install pritunl-client-electron</textarea>
         </div>
         <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-debian-stretch">
           <h3 class="title text-center">Debian Bookworm</h3>
           <textarea class="editor bash">sudo tee /etc/apt/sources.list.d/pritunl.list &lt;&lt; EOF
-deb http://repo.pritunl.com/stable/apt bookworm main
+deb [ signed-by=/usr/share/keyrings/pritunl.gpg ] https://repo.pritunl.com/stable/apt bookworm main
 EOF
 
-sudo apt install dirmngr
-sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com --recv 7568D9BB55FF9E5287D586017AE645C0CF8E292A
+sudo apt --assume-yes install gnupg
+curl -fsSL https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc | sudo gpg -o /usr/share/keyrings/pritunl.gpg --dearmor --yes
 sudo apt update
 sudo apt install pritunl-client-electron</textarea>
         </div>
@@ -1027,63 +1045,58 @@ <h3 class="title text-center">Debian Bookworm</h3>
           <h3 class="title text-center">Oracle Linux 9</h3>
           <textarea class="editor bash">sudo tee /etc/yum.repos.d/pritunl.repo &lt;&lt; EOF
 [pritunl]
-name=Pritunl Stable Repository
+name=Pritunl Repository
 baseurl=https://repo.pritunl.com/stable/yum/oraclelinux/9/
 gpgcheck=1
 enabled=1
+gpgkey=https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc
 EOF
 
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A > key.tmp; sudo rpm --import key.tmp; rm -f key.tmp
-sudo yum install pritunl-client-electron</textarea>
+sudo dnf install pritunl-client-electron</textarea>
         </div>
         <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-fedora">
-          <h3 class="title text-center">Fedora 39</h3>
+          <h3 class="title text-center">Fedora 40</h3>
           <textarea class="editor bash">sudo tee /etc/yum.repos.d/pritunl.repo &lt;&lt; EOF
 [pritunl]
-name=Pritunl Stable Repository
-baseurl=https://repo.pritunl.com/stable/yum/fedora/39/
+name=Pritunl Repository
+baseurl=https://repo.pritunl.com/stable/yum/fedora/40/
 gpgcheck=1
 enabled=1
+gpgkey=https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc
 EOF
 
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A > key.tmp; sudo rpm --import key.tmp; rm -f key.tmp
 sudo dnf install pritunl-client-electron</textarea>
         </div>
         <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-ubuntu-one">
           <h3 class="title text-center">Ubuntu Jammy</h3>
           <textarea class="editor bash">sudo tee /etc/apt/sources.list.d/pritunl.list &lt;&lt; EOF
-deb https://repo.pritunl.com/stable/apt jammy main
+deb [ signed-by=/usr/share/keyrings/pritunl.gpg ] https://repo.pritunl.com/stable/apt jammy main
 EOF
 
 sudo apt --assume-yes install gnupg
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A | sudo tee /etc/apt/trusted.gpg.d/pritunl.asc
+curl -fsSL https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc | sudo gpg -o /usr/share/keyrings/pritunl.gpg --dearmor --yes
 sudo apt update
 sudo apt install pritunl-client-electron</textarea>
         </div>
         <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-ubuntu-two">
           <h3 class="title text-center">Ubuntu Mantic</h3>
           <textarea class="editor bash">sudo tee /etc/apt/sources.list.d/pritunl.list &lt;&lt; EOF
-deb https://repo.pritunl.com/stable/apt mantic main
+deb [ signed-by=/usr/share/keyrings/pritunl.gpg ] https://repo.pritunl.com/stable/apt mantic main
 EOF
 
 sudo apt --assume-yes install gnupg
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A | sudo tee /etc/apt/trusted.gpg.d/pritunl.asc
+curl -fsSL https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc | sudo gpg -o /usr/share/keyrings/pritunl.gpg --dearmor --yes
 sudo apt update
 sudo apt install pritunl-client-electron</textarea>
         </div>
         <div class="item col-md-10 col-sm-12 col-xs-12 col-md-offset-1 install-ubuntu-three">
           <h3 class="title text-center">Ubuntu Noble</h3>
           <textarea class="editor bash">sudo tee /etc/apt/sources.list.d/pritunl.list &lt;&lt; EOF
-deb https://repo.pritunl.com/stable/apt noble main
+deb [ signed-by=/usr/share/keyrings/pritunl.gpg ] https://repo.pritunl.com/stable/apt noble main
 EOF
 
 sudo apt --assume-yes install gnupg
-gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 7568D9BB55FF9E5287D586017AE645C0CF8E292A
-gpg --armor --export 7568D9BB55FF9E5287D586017AE645C0CF8E292A | sudo tee /etc/apt/trusted.gpg.d/pritunl.asc
+curl -fsSL https://raw.githubusercontent.com/pritunl/pgp/master/pritunl_repo_pub.asc | sudo gpg -o /usr/share/keyrings/pritunl.gpg --dearmor --yes
 sudo apt update
 sudo apt install pritunl-client-electron</textarea>
         </div>