diff --git a/install/optional/app-1password.sh b/install/optional/app-1password.sh
index 46f9d0a..f6cb80e 100755
--- a/install/optional/app-1password.sh
+++ b/install/optional/app-1password.sh
@@ -1,6 +1,18 @@
-cd /tmp
-wget https://downloads.1password.com/linux/debian/amd64/stable/1password-latest.deb
-sudo apt install -y ./1password-latest.deb
-rm 1password-latest.deb
-cd -
+# Install 1password and 1password-cli single script
+curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
+sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg
 
+# Add apt repository
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/$(dpkg --print-architecture) stable main" |
+sudo tee /etc/apt/sources.list.d/1password.list
+
+# Add the debsig-verify policy
+sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/
+curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | \
+sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol
+sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22
+curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
+sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg
+
+# Install 1Password & 1password-cli
+sudo apt update && sudo apt install -y 1password 1password-cli
\ No newline at end of file
diff --git a/uninstall/app-1password.sh b/uninstall/app-1password.sh
old mode 100644
new mode 100755
index d033c51..e815522
--- a/uninstall/app-1password.sh
+++ b/uninstall/app-1password.sh
@@ -1 +1,5 @@
-sudo apt remove -y 1password
+sudo rm /etc/apt/sources.list.d/1password.list
+sudo rm /usr/share/keyrings/1password-archive-keyring.gpg
+sudo rm /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg
+sudo rm -r /etc/debsig/policies/AC2D62742012EA22/
+sudo apt-get remove --purge -y 1password 1password-cli