diff --git a/src/bin/eic_parse_authorized_keys b/src/bin/eic_parse_authorized_keys
index a98166a..8bdd0ad 100755
--- a/src/bin/eic_parse_authorized_keys
+++ b/src/bin/eic_parse_authorized_keys
@@ -320,7 +320,7 @@ output=$(
                                     /usr/bin/logger -i -p authpriv.info "${callermessage}"
                                 fi
                                 # Return key to the ssh daemon
-                                /bin/echo "${key}"
+                                /bin/echo "environment=\"EIC_CALLER=${caller}\" ${key}"
                                 exitcode=0
                             fi
                         fi
diff --git a/src/deb_systemd/ssh.service.d/ec2-instance-connect.conf b/src/deb_systemd/ssh.service.d/ec2-instance-connect.conf
index a921df0..deeef85 100644
--- a/src/deb_systemd/ssh.service.d/ec2-instance-connect.conf
+++ b/src/deb_systemd/ssh.service.d/ec2-instance-connect.conf
@@ -1,3 +1,3 @@
 [Service]
 ExecStart=
-ExecStart=/usr/sbin/sshd -D -o "AuthorizedKeysCommand /usr/share/ec2-instance-connect/eic_run_authorized_keys %%u %%f" -o "AuthorizedKeysCommandUser ec2-instance-connect" $SSHD_OPTS
+ExecStart=/usr/sbin/sshd -D -o "PermitUserEnvironment EIC_*" -o "AuthorizedKeysCommand /usr/share/ec2-instance-connect/eic_run_authorized_keys %%u %%f" -o "AuthorizedKeysCommandUser ec2-instance-connect" $SSHD_OPTS