diff --git a/bashrc b/bashrc
index d18adc0..72bb5eb 100644
--- a/bashrc
+++ b/bashrc
@@ -3,3 +3,5 @@ export PYTHONPATH="$PYTHONPATH:$HOME/.python_dev_links"
 export PATH="$PATH:$HOME/.python_dev_links"
 export PATH="/usr/local/bin:$PATH"
 export PATH="$HOME/bin:$PATH"
+. "$HOME/.cargo/env"
+export AWS_PROFILE=saml
diff --git a/gitconfig b/gitconfig
index ccc52e0..16b6fe0 100644
--- a/gitconfig
+++ b/gitconfig
@@ -1,6 +1,7 @@
 [user]
 	name = GMadorell
 	email = gmadorell@gmail.com
+	signingKey = 9F60F45397854874
 [alias]
 	branches = branch -a
 	tags = tag
@@ -31,11 +32,9 @@
 	noprefix = false
 [rerere]
 	enabled = true
-[filesystem "N/A|13.0.2|/dev/disk1s1"]
-	timestampResolution = 8000 nanoseconds
-	minRacyThreshold = 0 nanoseconds
-[filesystem "Oracle Corporation|1.8.0_181|/dev/disk1s1"]
-	timestampResolution = 1001 milliseconds
-	minRacyThreshold = 0 nanoseconds
 [pull]
 	ff = only
+[commit]
+	gpgsign = true
+[gpg]
+	program = /opt/homebrew/bin/gpg
diff --git a/zshrc b/zshrc
index 95e6d93..20bcf81 100644
--- a/zshrc
+++ b/zshrc
@@ -172,6 +172,9 @@ alias killsbt="kill_sbt"
 # C# setup
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 
+# PGP/GPG setup
+export GPG_TTY=$(tty)
+
 
 # Service aliases
 : '
@@ -319,6 +322,9 @@ function escheck() {
 function escnf() { $EDITOR /usr/local/etc/elasticsearch/elasticsearch.yml ; }
 function esplugin() { /usr/local/opt/elasticsearch@5.6/libexec/bin/elasticsearch-plugin $@ ; }
 
+# AWS
+export AWS_PROFILE=saml
+
 # Internet / Connectivity
 function is_connected_to_internet {
   wget -q --tries=10 --timeout=20 --spider http://google.com