diff --git a/terraform/user_machine.tf b/terraform/user_machine.tf
index c6b3a26..88ec01f 100644
--- a/terraform/user_machine.tf
+++ b/terraform/user_machine.tf
@@ -5,7 +5,7 @@
 
 output "user_machine_ssh_command" {
   description = "Command to launch an ssh shell on the user machine."
-  value       = "gcloud compute ssh --zone '${var.zone}' '${google_compute_instance.user_machine.name}' --project '${google_project.project.project_id}'"
+  value       = "gcloud compute ssh --zone '${var.zone}' --project '${google_project.project.project_id}' '${google_compute_instance.user_machine.name}'"
 }
 
 resource "google_service_account" "user_machine" {
@@ -30,6 +30,7 @@ resource "google_compute_instance" "user_machine" {
   network_interface {
     network    = google_compute_network.default.id
     subnetwork = google_compute_subnetwork.default.id
+    network_ip = google_compute_address.user_machine.address
   }
 
   service_account {
@@ -56,3 +57,22 @@ resource "google_compute_firewall" "allow_iap_ssh" {
   source_ranges = ["35.235.240.0/20"]
   target_tags   = ["allow-iap-ssh"]
 }
+
+resource "google_compute_address" "user_machine" {
+  project      = google_project.project.project_id
+  name         = "user-machine"
+  region       = var.region
+  address_type = "INTERNAL"
+  subnetwork   = google_compute_subnetwork.default.id
+}
+
+resource "google_dns_record_set" "user_machine" {
+  project = google_project.project.project_id
+  name    = "usermachine.${google_dns_managed_zone.zone.dns_name}"
+  type    = "A"
+  ttl     = 300
+
+  managed_zone = google_dns_managed_zone.zone.name
+
+  rrdatas = [google_compute_instance.user_machine.network_interface[0].network_ip]
+}