diff --git a/README.md b/README.md
index 829c14b..619a131 100644
--- a/README.md
+++ b/README.md
@@ -63,6 +63,7 @@ services:
     environment:
       TWS_USERID: ${TWS_USERID}
       TWS_PASSWORD: ${TWS_PASSWORD}
+      TWOFA_DEVICE: ${TWOFA_DEVICE}
       TRADING_MODE: ${TRADING_MODE:-paper}
       TWS_SETTINGS_PATH: ${TWS_SETTINGS_PATH:-}
       TWS_ACCEPT_INCOMING: ${TWS_ACCEPT_INCOMING:-}
diff --git a/docker-compose.yml b/docker-compose.yml
index c899636..27a314a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,7 @@ services:
     environment:
       TWS_USERID: ${TWS_USERID}
       TWS_PASSWORD: ${TWS_PASSWORD}
+      TWOFA_DEVICE: ${TWOFA_DEVICE}
       TRADING_MODE: ${TRADING_MODE:-paper}
       TWS_USERID_PAPER: ${TWS_USERID_PAPER:-}
       TWS_PASSWORD_PAPER: ${TWS_PASSWORD_PAPER:-}
diff --git a/latest/config/ibc/config.ini.tmpl b/latest/config/ibc/config.ini.tmpl
index 6c5cd35..c0bfb19 100644
--- a/latest/config/ibc/config.ini.tmpl
+++ b/latest/config/ibc/config.ini.tmpl
@@ -112,7 +112,7 @@ FIXPassword=
 # in the list. If no value is set, you must manually select the
 # relevant list entry.
 
-SecondFactorDevice=
+SecondFactorDevice=${TWOFA_DEVICE}
 
 
 # If you use the IBKR Mobile app for second factor authentication,
diff --git a/stable/config/ibc/config.ini.tmpl b/stable/config/ibc/config.ini.tmpl
index c4f1f4b..5606dfa 100644
--- a/stable/config/ibc/config.ini.tmpl
+++ b/stable/config/ibc/config.ini.tmpl
@@ -112,7 +112,7 @@ FIXPassword=
 # in the list. If no value is set, you must manually select the
 # relevant list entry.
 
-SecondFactorDevice=
+SecondFactorDevice=${TWOFA_DEVICE}
 
 
 # If you use the IBKR Mobile app for second factor authentication,
diff --git a/template_README.md b/template_README.md
index 08b5fee..54c8e09 100644
--- a/template_README.md
+++ b/template_README.md
@@ -63,6 +63,7 @@ services:
     environment:
       TWS_USERID: ${TWS_USERID}
       TWS_PASSWORD: ${TWS_PASSWORD}
+      TWOFA_DEVICE: ${TWOFA_DEVICE}
       TRADING_MODE: ${TRADING_MODE:-paper}
       TWS_SETTINGS_PATH: ${TWS_SETTINGS_PATH:-}
       TWS_ACCEPT_INCOMING: ${TWS_ACCEPT_INCOMING:-}
diff --git a/tws-docker-compose.yml b/tws-docker-compose.yml
index a4d346b..095cbbc 100644
--- a/tws-docker-compose.yml
+++ b/tws-docker-compose.yml
@@ -19,6 +19,7 @@ services:
       PASSWD: ${PASSWD:-}
       TWS_USERID: ${TWS_USERID}
       TWS_PASSWORD: ${TWS_PASSWORD}
+      TWOFA_DEVICE: ${TWOFA_DEVICE}
       TRADING_MODE: ${TRADING_MODE:-paper}
       TWS_USERID_PAPER: ${TWS_USERID_PAPER:-}
       TWS_PASSWORD_PAPER: ${TWS_PASSWORD_PAPER:-}