diff --git a/playbooks/facts/main.yml b/playbooks/facts/main.yml
index d66f15c..7c8516d 100644
--- a/playbooks/facts/main.yml
+++ b/playbooks/facts/main.yml
@@ -35,8 +35,3 @@
 - name: Define the commonName
   set_fact:
     IP_subject_alt_name: "{{ IP_subject_alt_name }}"
-
-- name: Change the algorithm to RSA
-  set_fact:
-    algo_params: "rsa:2048"
-  when: Win10_Enabled is defined and Win10_Enabled == "Y"
diff --git a/roles/vpn/defaults/main.yml b/roles/vpn/defaults/main.yml
index d4e9bfd..49f118d 100644
--- a/roles/vpn/defaults/main.yml
+++ b/roles/vpn/defaults/main.yml
@@ -25,5 +25,5 @@ ciphers:
     ike: aes128gcm16-prfsha512-ecp256!
     esp: aes128gcm16-ecp256!
   compat:
-    ike: aes128gcm16-prfsha512-ecp256,aes128-sha2_512-prfsha512-ecp256,aes128-sha2_256-prfsha256-modp2048!
-    esp: aes128gcm16-ecp256,aes128-sha2_512-prfsha512-ecp256,aes128-sha2_256-prfsha256-modp2048!
+    ike: aes128gcm16-prfsha512-ecp256,aes128-sha2_512-prfsha512-ecp256,aes128-sha2_384-prfsha384-ecp256!
+    esp: aes128gcm16-ecp256,aes128-sha2_512-prfsha512-ecp256!
diff --git a/roles/vpn/templates/client_ipsec.secrets.j2 b/roles/vpn/templates/client_ipsec.secrets.j2
index 0d8356e..9feb9f5 100644
--- a/roles/vpn/templates/client_ipsec.secrets.j2
+++ b/roles/vpn/templates/client_ipsec.secrets.j2
@@ -1,5 +1 @@
-{% if Win10_Enabled is defined and Win10_Enabled == "Y" %}
-{{ IP_subject_alt_name }} : RSA {{ item }}.key
-{% else %}
 {{ IP_subject_alt_name }} : ECDSA {{ item }}.key
-{% endif %}
diff --git a/roles/vpn/templates/client_windows.ps1.j2 b/roles/vpn/templates/client_windows.ps1.j2
index 4df2297..4eb87aa 100644
--- a/roles/vpn/templates/client_windows.ps1.j2
+++ b/roles/vpn/templates/client_windows.ps1.j2
@@ -1,3 +1,3 @@
 certutil -f -p {{ easyrsa_p12_export_password }} -importpfx .\{{ item }}.p12
 Add-VpnConnection -name "Algo VPN {{ IP_subject_alt_name }} IKEv2" -ServerAddress "{{ IP_subject_alt_name }}" -TunnelType IKEv2 -AuthenticationMethod MachineCertificate -EncryptionLevel Required
-Set-VpnConnectionIPsecConfiguration -ConnectionName "Algo VPN {{ IP_subject_alt_name }} IKEv2" -AuthenticationTransformConstants SHA256128 -CipherTransformConstants AES128 -EncryptionMethod AES128 -IntegrityCheckMethod SHA256 -DHGroup Group14 -PfsGroup none
+Set-VpnConnectionIPsecConfiguration -ConnectionName "Algo VPN {{ IP_subject_alt_name }} IKEv2" -AuthenticationTransformConstants GCMAES128 -CipherTransformConstants GCMAES128 -EncryptionMethod AES128 -IntegrityCheckMethod SHA384 -DHGroup ECP256 -PfsGroup none
diff --git a/roles/vpn/templates/ipsec.secrets.j2 b/roles/vpn/templates/ipsec.secrets.j2
index 2226f04..27df8f6 100644
--- a/roles/vpn/templates/ipsec.secrets.j2
+++ b/roles/vpn/templates/ipsec.secrets.j2
@@ -1,5 +1 @@
-{% if Win10_Enabled is defined and Win10_Enabled == "Y" %}
-: RSA {{ IP_subject_alt_name }}.key
-{% else %}
 : ECDSA {{ IP_subject_alt_name }}.key
-{% endif %}