diff --git a/.config/fish/conf.d/fish-ssh-agent.fish b/.config/fish/conf.d/fish-ssh-agent.fish
new file mode 100644
index 0000000..719087a
--- /dev/null
+++ b/.config/fish/conf.d/fish-ssh-agent.fish
@@ -0,0 +1,7 @@
+if test -z "$SSH_ENV"
+    set -xg SSH_ENV $HOME/.ssh/environment
+end
+
+if not __ssh_agent_is_started
+    __ssh_agent_start
+end
diff --git a/.config/fish/functions/__ssh_agent_is_started.fish b/.config/fish/functions/__ssh_agent_is_started.fish
new file mode 100644
index 0000000..a9da28a
--- /dev/null
+++ b/.config/fish/functions/__ssh_agent_is_started.fish
@@ -0,0 +1,23 @@
+function __ssh_agent_is_started -d "check if ssh agent is already started"
+	if test -n "$SSH_CONNECTION"
+		# This is an SSH session
+		ssh-add -l > /dev/null 2>&1
+		if test $status -eq 0 -o $status -eq 1
+			# An SSH agent was forwarded
+			return 0
+		end
+	end
+
+	if begin; test -f "$SSH_ENV"; and test -z "$SSH_AGENT_PID"; end
+		source $SSH_ENV > /dev/null
+	end
+
+	if test -z "$SSH_AGENT_PID"
+		return 1
+	end
+
+	ssh-add -l > /dev/null 2>&1
+	if test $status -eq 2
+		return 1
+	end
+end
diff --git a/.config/fish/functions/__ssh_agent_start.fish b/.config/fish/functions/__ssh_agent_start.fish
new file mode 100644
index 0000000..3766fe4
--- /dev/null
+++ b/.config/fish/functions/__ssh_agent_start.fish
@@ -0,0 +1,5 @@
+function __ssh_agent_start -d "start a new ssh agent"
+  ssh-agent -c | sed 's/^echo/#echo/' > $SSH_ENV
+  chmod 600 $SSH_ENV
+  source $SSH_ENV > /dev/null
+end
diff --git a/.config/fish/functions/docker-restart-all-containers.fish b/.config/fish/functions/docker-restart-all-containers.fish
deleted file mode 100644
index 7a2e800..0000000
--- a/.config/fish/functions/docker-restart-all-containers.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function docker-restart-all-containers
-	bash "$HOME/.bin/docker-restart-all-containers"
-end
diff --git a/.config/fish/functions/docker-upgrade-all-containers.fish b/.config/fish/functions/docker-upgrade-all-containers.fish
deleted file mode 100644
index 06c8bfa..0000000
--- a/.config/fish/functions/docker-upgrade-all-containers.fish
+++ /dev/null
@@ -1,3 +0,0 @@
-function docker-upgrade-all-containers
-	bash "$HOME/.bin/docker-upgrade-all-containers"
-end