diff --git a/create_ap b/create_ap
index f23d444..ecb9d71 100755
--- a/create_ap
+++ b/create_ap
@@ -630,6 +630,9 @@ NEW_MACADDR=
 DAEMONIZE=0
 NO_HAVEGED=0
 USE_PSK=0
+MITIGATE_KRACK=1
+IEEE80211W_LEVEL=0
+WPA_CIPHER=TKIP CCMP
 
 HOSTAPD_DEBUG_ARGS=
 REDIRECT_TO_LOCALHOST=0
@@ -1657,8 +1660,10 @@ if [[ -n "$PASSPHRASE" ]]; then
 wpa=${WPA_VERSION}
 wpa_${WPA_KEY_TYPE}=${PASSPHRASE}
 wpa_key_mgmt=WPA-PSK
-wpa_pairwise=TKIP CCMP
+wpa_pairwise=${WPA_CIPHER}
 rsn_pairwise=CCMP
+wpa_disable_eapol_key_retries=${MITIGATE_KRACK}
+ieee80211w=${IEEE80211W_LEVEL}
 EOF
 fi
 
diff --git a/create_ap.conf b/create_ap.conf
index 9f55f09..21309bc 100644
--- a/create_ap.conf
+++ b/create_ap.conf
@@ -26,3 +26,6 @@ INTERNET_IFACE=eth0
 SSID=MyAccessPoint
 PASSPHRASE=12345678
 USE_PSK=0
+MITIGATE_KRACK=1
+IEEE80211W_LEVEL=0
+WPA_CIPHER=TKIP CCMP