diff --git a/_gpg_bashrc b/_gpg_bashrc
deleted file mode 100644
index 26e37ca..0000000
--- a/_gpg_bashrc
+++ /dev/null
@@ -1,2 +0,0 @@
-export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-gpgconf --launch gpg-agent
\ No newline at end of file
diff --git a/gpgkey.pri.gpg b/gpgkey.pri.gpg
deleted file mode 100644
index 781d2d1..0000000
Binary files a/gpgkey.pri.gpg and /dev/null differ
diff --git a/gpgkey.pub b/gpgkey.pub
deleted file mode 100644
index 24e5cfe..0000000
--- a/gpgkey.pub
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEXBXisxYJKwYBBAHaRw8BAQdAvtGDoPzGR0L9iK8Tm29qSUACWqZ+EyVbqRt1
-77MLa5S0GW9wNTIgPG9wNTJAaGFyZGZhdWx0Lm9yZz6IkAQTFggAOBYhBEe44Ba/
-l3npdVMkj6mx1MmGz8jEBQJcFg5EAhsBBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheA
-AAoJEKmx1MmGz8jEi7QA/3+OmxdkznZDkwn02REpISlGf6l72M6DsY/PTNuGhxWy
-AQDM2p0SQjHLVQt1FhK5yvZNGa2hV3/5VoW7LVUn+BozA7gzBFwV5EcWCSsGAQQB
-2kcPAQEHQH0cxzSmbUnSGNSFhKA80pEGOpmXmJllOUnuLq0nuARfiO8EGBYIACAW
-IQRHuOAWv5d56XVTJI+psdTJhs/IxAUCXBXkRwIbAgCBCRCpsdTJhs/IxHYgBBkW
-CAAdFiEEchq7d8FSA16v3TwAMmGD2bdOXIcFAlwV5EcACgkQMmGD2bdOXIeCrQEA
-1WOMSgpm2KF2I559Gp+ZOu6JgrCzUuNYOWUhahQCC5YBANNaZs36qU3kmBOg76Kk
-P5mZ87bZFFT3hzi2S7vzK7wGZ0gA/2+ZPgHABJ8lblYrYMiv9bT91ZhwjkqBZVLk
-b6tPRliPAQDyGnkmEj5gdnEDfqfSTw+8vlBEUyZ6eCC46EG7+pIvBbg4BFwV5F4S
-CisGAQQBl1UBBQEBB0CA6llmQyPbHVWvy7R479s/kUNMC5geT198VUME/afECAMB
-CAeIeAQYFggAIBYhBEe44Ba/l3npdVMkj6mx1MmGz8jEBQJcFeReAhsMAAoJEKmx
-1MmGz8jE1voBAO3qrYmOmWJHwFRhKQ+zSDENjI6rxURITpP7dh0WjXvtAP0fuHfs
-jm/vkjCwNRtbi04HL2YuQAGMrcJQjvfonlmWCrgzBFwV9ZsWCSsGAQQB2kcPAQEH
-QG00yfQHb2xHOu3VD4TWpprB0+bD6qH5A3T7f3BFyByBiHgEGBYIACAWIQRHuOAW
-v5d56XVTJI+psdTJhs/IxAUCXBX1mwIbIAAKCRCpsdTJhs/IxAnwAQCOFGjQsgUX
-GHw5dLvQWEqdjdkxiQch8wXMFMKYJUTasgEA+gOBv+HY14ejUvqU1nCTQ7FeyVzP
-WTSy49pQfBRbKQw=
-=5Du+
------END PGP PUBLIC KEY BLOCK-----
diff --git a/id_op52.gpg b/id_op52.gpg
new file mode 100644
index 0000000..13f86c1
Binary files /dev/null and b/id_op52.gpg differ
diff --git a/id_op52.pub b/id_op52.pub
new file mode 100644
index 0000000..8f74f21
--- /dev/null
+++ b/id_op52.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBtNDfo32qA34MFEIxdQT+yJ0uY9UkKrCsmh1GAFJEKE op52@OPDESK
diff --git a/setup1_apt.sh b/setup1_apt.sh
old mode 100644
new mode 100755
diff --git a/setup2_gpg.sh b/setup2_gpg.sh
old mode 100644
new mode 100755
index 07f5380..2ad66b2
--- a/setup2_gpg.sh
+++ b/setup2_gpg.sh
@@ -1,18 +1,11 @@
 #!/bin/bash
 
-KEY_GRIP=5351806D27F0E18166370620F4ED903E973C03C6
+echo "Installing keychain..."
+sudo apt install keychain
 
-echo "Importing keys"
-gpg --import gpgkey.pub
-gpg --import gpgkey.pri
+echo "Copying private key..."
+cp id_op52 ~/.ssh/id_op52
 
-echo "Adding ssh support"
-echo "enable-ssh-support" >> $HOME/.gnupg/gpg-agent.conf
-cat _gpg_bashrc >> $HOME/.bashrc
-echo $KEY_GRIP >> $HOME/.gnupg/sshcontrol
-
-echo "Restarting gpg-agent"
-gpgconf --kill gpg-agent
-gpgconf --launch gpg-agent
-
-echo "Please use \"gpg --editkeys key_id\" to trust your keys"
\ No newline at end of file
+echo "Configuring keychain..."
+echo "# Configured for keychain" >> ~/.bashrc
+echo "eval \`keychain --eval --agents ssh id_op52\`" >> ~/.bashrc
diff --git a/setup3_ubuntu_pkg.sh b/setup3_ubuntu_pkg.sh
old mode 100644
new mode 100755
diff --git a/setupo_laptop_pwr.sh b/setupo_laptop_pwr.sh
old mode 100644
new mode 100755
diff --git a/setupo_laptop_undervolt.sh b/setupo_laptop_undervolt.sh
old mode 100644
new mode 100755
diff --git a/setupo_laptop_wakeup.sh b/setupo_laptop_wakeup.sh
old mode 100644
new mode 100755
diff --git a/setupo_prime_sync.sh b/setupo_prime_sync.sh
old mode 100644
new mode 100755
diff --git a/setupo_unins_firefox.sh b/setupo_unins_firefox.sh
old mode 100644
new mode 100755
diff --git a/setupo_wsl.sh b/setupo_wsl.sh
old mode 100644
new mode 100755