diff --git a/playbooks/aethermgmt-playbook.yml b/playbooks/aethermgmt-playbook.yml
index 597b5e4..305b0e3 100644
--- a/playbooks/aethermgmt-playbook.yml
+++ b/playbooks/aethermgmt-playbook.yml
@@ -4,9 +4,10 @@
   hosts: mgmt
   become: true
   roles:
-   - netprep
-   - nsd
-   - unbound
-   - dhcpd
-   - nginx
-   - onieboot
+    - netprep
+    - nsd
+    - unbound
+    - dhcpd
+    - nginx
+    - onieboot
+    - users
diff --git a/scripts/base_edgeconfig.yaml b/scripts/base_edgeconfig.yaml
index e72fd8e..32b6bc0 100644
--- a/scripts/base_edgeconfig.yaml
+++ b/scripts/base_edgeconfig.yaml
@@ -13,3 +13,13 @@
     autoindex: true
 
 acme_username: "www-data"  # make independent of the acme role
+
+userlist:
+  - username: terraform
+    comment: "ONF Terraform User"
+    bcrypt: "$2b$16$svkAgSPbpqUNU1.TbD7haue3Pngyp7xtP7s0IJZokbdJzijsBk4gW"
+    sha512crypt: "$6$rounds=656000$Y0b5yy7/SE7K069v$lZNFnXbEqMTV7/gjPPhls2UcJhJtbC.H1VKOR2DdzWdywxMXv8QnUnG0iTUzS9we6yjfAj2s2clRiGQhnT/zJ0"
+    sudoer: true
+
+users_sudoers:
+  - "terraform ALL=(ALL) NOPASSWD: ALL"