diff --git a/deployments-balancer/inventory b/deployments-balancer/inventory
index 9a0cf25..2b54a11 100644
--- a/deployments-balancer/inventory
+++ b/deployments-balancer/inventory
@@ -10,5 +10,5 @@ balancer
 app
 
 [deployments:vars]
-ansible_ssh_user=vagrant
+ansible_user=vagrant
 ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key
diff --git a/deployments-rolling/inventory b/deployments-rolling/inventory
index 1afc7ed..ce01a40 100644
--- a/deployments-rolling/inventory
+++ b/deployments-rolling/inventory
@@ -5,5 +5,5 @@
 192.168.3.5
 
 [nodejs-api:vars]
-ansible_ssh_user=vagrant
+ansible_user=vagrant
 ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key
diff --git a/deployments/playbooks/inventory-ansible b/deployments/playbooks/inventory-ansible
index 4264a2a..fb6fa6c 100644
--- a/deployments/playbooks/inventory-ansible
+++ b/deployments/playbooks/inventory-ansible
@@ -2,5 +2,5 @@
 192.168.33.7
 
 [rails:vars]
-ansible_ssh_user=vagrant
+ansible_user=vagrant
 ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key
diff --git a/dynamic-inventory/custom/inventory.php b/dynamic-inventory/custom/inventory.php
index 71f9fc0..03237ea 100755
--- a/dynamic-inventory/custom/inventory.php
+++ b/dynamic-inventory/custom/inventory.php
@@ -17,7 +17,7 @@ function example_inventory() {
     'group' => [
       'hosts' => ['192.168.28.71', '192.168.28.72'],
       'vars' => [
-        'ansible_ssh_user' => 'vagrant',
+        'ansible_user' => 'vagrant',
         'ansible_ssh_private_key_file' => '~/.vagrant.d/insecure_private_key',
         'ansible_python_interpreter' => '/usr/bin/python3',
         'example_variable' => 'value',
diff --git a/dynamic-inventory/custom/inventory.py b/dynamic-inventory/custom/inventory.py
index 081e3c0..1b15f1a 100755
--- a/dynamic-inventory/custom/inventory.py
+++ b/dynamic-inventory/custom/inventory.py
@@ -38,7 +38,7 @@ class ExampleInventory(object):
             'group': {
                 'hosts': ['192.168.28.71', '192.168.28.72'],
                 'vars': {
-                    'ansible_ssh_user': 'vagrant',
+                    'ansible_user': 'vagrant',
                     'ansible_ssh_private_key_file':
                         '~/.vagrant.d/insecure_private_key',
                     'ansible_python_interpreter':
diff --git a/https-letsencrypt/inventory.example b/https-letsencrypt/inventory.example
index ff9f7c3..cd8cd26 100644
--- a/https-letsencrypt/inventory.example
+++ b/https-letsencrypt/inventory.example
@@ -2,5 +2,5 @@
 subdomain.example.com
 
 [letsencrypt:vars]
-ansible_ssh_user=myuser
+ansible_user=myuser
 letsencrypt_email=webmaster@example.com
diff --git a/kubernetes/inventory b/kubernetes/inventory
index f59d147..2373973 100644
--- a/kubernetes/inventory
+++ b/kubernetes/inventory
@@ -10,5 +10,5 @@ k8s-master
 k8s-nodes
 
 [k8s:vars]
-ansible_ssh_user=vagrant
+ansible_user=vagrant
 ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key
\ No newline at end of file
diff --git a/lamp-infrastructure/Vagrantfile b/lamp-infrastructure/Vagrantfile
index 5d47937..fd77b84 100644
--- a/lamp-infrastructure/Vagrantfile
+++ b/lamp-infrastructure/Vagrantfile
@@ -71,7 +71,7 @@ Vagrant.configure("2") do |config|
       ansible.inventory_path = "inventories/vagrant/inventory"
       ansible.limit = "all"
       ansible.extra_vars = {
-        ansible_ssh_user: 'vagrant',
+        ansible_user: 'vagrant',
         ansible_ssh_private_key_file: "~/.vagrant.d/insecure_private_key"
       }
     end
diff --git a/lamp-infrastructure/provisioners/aws.yml b/lamp-infrastructure/provisioners/aws.yml
index c9ae97d..88cf4b9 100644
--- a/lamp-infrastructure/provisioners/aws.yml
+++ b/lamp-infrastructure/provisioners/aws.yml
@@ -96,7 +96,7 @@
         name: "{{ item.1.tagged_instances.0.public_ip }}"
         groups: "aws,{{ item.1.item.group }},{{ item.1.item.name }}"
         # You can dynamically add inventory variables per-host.
-        ansible_ssh_user: ec2-user
+        ansible_user: ec2-user
         host_key_checking: false
         mysql_replication_role: >
           {{ 'master' if (item.1.item.name == 'a4d.lamp.db.1')
diff --git a/lamp-infrastructure/provisioners/digitalocean.yml b/lamp-infrastructure/provisioners/digitalocean.yml
index 3700952..911dcc7 100644
--- a/lamp-infrastructure/provisioners/digitalocean.yml
+++ b/lamp-infrastructure/provisioners/digitalocean.yml
@@ -33,7 +33,7 @@
         name: "{{ item.1.droplet.ip_address }}"
         groups: "do,{{ droplets[item.0].group }},{{ item.1.droplet.name }}"
         # You can dynamically add inventory variables per-host.
-        ansible_ssh_user: root
+        ansible_user: root
         mysql_replication_role: >
           "{{ 'master' if (item.1.droplet.name == 'a4d.lamp.db.1')
           else 'slave' }}"
diff --git a/orchestration/inventory b/orchestration/inventory
index 25e2a6f..03b5f14 100644
--- a/orchestration/inventory
+++ b/orchestration/inventory
@@ -14,6 +14,6 @@ db
 
 # Variables that will be applied to all servers
 [multi:vars]
-ansible_ssh_user=vagrant
+ansible_user=vagrant
 ansible_ssh_private_key_file=~/.vagrant.d/insecure_private_key
 ansible_ssh_common_args='-o StrictHostKeyChecking=no'