diff --git a/Fedora-Workstation-38.sh b/Fedora-Workstation-38.sh
index 211413b..ad051be 100644
--- a/Fedora-Workstation-38.sh
+++ b/Fedora-Workstation-38.sh
@@ -48,8 +48,8 @@ OPTIONS="-F 1"' | sudo tee /etc/sysconfig/chronyd
 sudo systemctl restart chronyd
 
 # Setup Networking
-echo -e '[device]\nwifi.scan-rand-mac-address=yes\n\n[connection]\nwifi.cloned-mac-address=random\nethernet.cloned-mac-address=random' | sudo tee /etc/NetworkManager/conf.d/99-random-mac.conf
-echo -e '[main]\nhostname-mode=none' | sudo tee /etc/NetworkManager/conf.d/01-transient-hostname.conf
+sudo curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Script/main/etc/NetworkManager/conf.d/00-macrandomize.conf -o /etc/NetworkManager/conf.d/00-macrandomize.conf
+sudo curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Script/main/etc/NetworkManager/conf.d/01-transient-hostname.conf -o /etc/NetworkManager/conf.d/01-transient-hostname.conf
 sudo nmcli general reload conf
 sudo hostnamectl hostname 'localhost'
 sudo hostnamectl --transient hostname ''
diff --git a/Ubuntu-22.04-Desktop.sh b/Ubuntu-22.04-Desktop.sh
index d25bb14..2d48ddc 100644
--- a/Ubuntu-22.04-Desktop.sh
+++ b/Ubuntu-22.04-Desktop.sh
@@ -28,7 +28,7 @@ sudo usg fix cis_level2_workstation
 # Remove AIDE
 sudo apt purge -y aide*
 
-# Allow su which is disabled by CIS 
+# Allow su which is disabled by CIS
 sudo sed -i 's/auth required pam_wheel.so use_uid group=sugroup//g' /etc/pam.d/su
 
 # Setting umask to 077
@@ -126,17 +126,12 @@ sudo snap remove firefox
 sudo apt install -y git-core gnome-text-editor
 sudo snap install eog
 
-# Randomize MAC address
-sudo bash -c 'cat > /etc/NetworkManager/conf.d/00-macrandomize.conf' <<-'EOF'
-[device]
-wifi.scan-rand-mac-address=yes
-[connection]
-wifi.cloned-mac-address=random
-ethernet.cloned-mac-address=random
-connection.stable-id=${CONNECTION}/${BOOT}
-EOF
-
-sudo systemctl restart NetworkManager
+# Setup Networking
+sudo curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Script/main/etc/NetworkManager/conf.d/00-macrandomize.conf -o /etc/NetworkManager/conf.d/00-macrandomize.conf
+sudo curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Script/main/etc/NetworkManager/conf.d/01-transient-hostname.conf -o /etc/NetworkManager/conf.d/01-transient-hostname.conf
+sudo nmcli general reload conf
+sudo hostnamectl hostname 'localhost'
+sudo hostnamectl --transient hostname ''
 
 # Enable fstrim.timer
 sudo apt install tuned -y
diff --git a/etc/NetworkManager/conf.d/00-macrandomize.conf b/etc/NetworkManager/conf.d/00-macrandomize.conf
new file mode 100644
index 0000000..d2f9fbc
--- /dev/null
+++ b/etc/NetworkManager/conf.d/00-macrandomize.conf
@@ -0,0 +1,6 @@
+[device]
+wifi.scan-rand-mac-address=yes
+[connection]
+wifi.cloned-mac-address=random
+ethernet.cloned-mac-address=random
+connection.stable-id=${CONNECTION}/${BOOT}
\ No newline at end of file
diff --git a/etc/NetworkManager/conf.d/01-transient-hostname.conf b/etc/NetworkManager/conf.d/01-transient-hostname.conf
new file mode 100644
index 0000000..30300b6
--- /dev/null
+++ b/etc/NetworkManager/conf.d/01-transient-hostname.conf
@@ -0,0 +1,2 @@
+[main]
+hostname-mode=none
\ No newline at end of file