diff --git a/src/tripleo_aio_helpers/create_aio_vm.py b/src/tripleo_aio_helpers/create_aio_vm.py
index 6be52f8..95a088b 100644
--- a/src/tripleo_aio_helpers/create_aio_vm.py
+++ b/src/tripleo_aio_helpers/create_aio_vm.py
@@ -14,12 +14,11 @@ ND_PATH = "./network-config"
 
 def parse_args():
     """Parse the command line arguments"""
+    import pdb;pdb.set_trace()
     parser = argparse.ArgumentParser()
     parser.add_argument("--password", required=True)
     parser.add_argument("--public-key", required=True, type=open)
-    parser.add_argument(
-        "--local-hostname", default="aio3.gpslab.cbr.redhat.com"
-    )
+    parser.add_argument("--local-hostname", required=True)
     parser.add_argument("--user-data", default="./src/virt-install/user-data.tpl", type=open)
     parser.add_argument("--meta-data", default="./src/virt-install/meta-data.tpl", type=open)
     parser.add_argument(
diff --git a/src/tripleo_aio_helpers/prepare_deployment.py b/src/tripleo_aio_helpers/prepare_deployment.py
index 84ca42e..993805a 100644
--- a/src/tripleo_aio_helpers/prepare_deployment.py
+++ b/src/tripleo_aio_helpers/prepare_deployment.py
@@ -16,7 +16,7 @@ def parse_args():
     parser.add_argument("-u", "--username", required=True)
     parser.add_argument("-p", "--password", required=True)
     parser.add_argument("-a", "--address", required=True)
-    parser.add_argument("-i", "--interface", default="enp1s0")
+    parser.add_argument("-i", "--interface", required=True)
     parser.add_argument("-m", "--netmask", default=24)
     parser.add_argument(
         "-d", "--dns", nargs="+", action="append", required=True
@@ -151,6 +151,11 @@ def main():
         deploy.write(deploy_sh(args))
     print(f"deploy script written to {args.deploy}")
 
+    print("If you are running on a cloud image remenber to disable cloud-init before running the deploy.")
+    print("sudo systemctl stop cloud-init")
+    print("sudo systemctl disable cloud-init")
+    print("Make sure you have specifed the correct interface to use!")
+
 
 if __name__ == "__main__":
     main()
diff --git a/src/virt-install/user-data.tpl b/src/virt-install/user-data.tpl
index 33cddfb..457d0f3 100644
--- a/src/virt-install/user-data.tpl
+++ b/src/virt-install/user-data.tpl
@@ -9,7 +9,6 @@ ssh_authorized_keys:
   - {data.public_key}
 {data.bootcmd}
 runcmd:
-  - "service sshd restart"
   - "subscription-manager register --username {data.rhn_user} --password '{data.rhn_password}'"
   - "subscription-manager release --set=8.4"
   - "dnf install -y dnf-utils"