diff --git a/roles/terraform/templates/esxi-ubuntu.tf.j2 b/roles/terraform/templates/esxi-ubuntu.tf.j2
index 7956488..a005846 100644
--- a/roles/terraform/templates/esxi-ubuntu.tf.j2
+++ b/roles/terraform/templates/esxi-ubuntu.tf.j2
@@ -20,7 +20,7 @@ resource "esxi_guest" "{{ each.name }}" {
   {% if each.notes is defined -%}
   notes              = "{{ each.notes }}"
   {% endif %}
-  ovf_source         = "https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.ova"
+  ovf_source         = "https://cloud-images.ubuntu.com/releases/mantic/release/ubuntu-23.10-server-cloudimg-amd64.ova"
   network_interfaces {
     virtual_network  = "{{ each.network | default('VM Network') }}"
   }
diff --git a/roles/terraform/templates/fedora-cloud.tpl.j2 b/roles/terraform/templates/fedora-cloud.tpl.j2
index 26e0952..ff31fef 100644
--- a/roles/terraform/templates/fedora-cloud.tpl.j2
+++ b/roles/terraform/templates/fedora-cloud.tpl.j2
@@ -48,8 +48,6 @@ hostname: ${HOSTNAME}
 #  Write to a log file (useing variables set in terraform) and show the ip on the console.
 runcmd:
   - date >/root/cloudinit.log
-  - hostnamectl set-hostname ${HOSTNAME}
-  - dnf vim git install -y cockpit >>/root/cloudinit.log
   - systemctl enable --now cockpit >>/root/cloudinit.log
   - echo "Done cloud-init" >>/root/cloudinit.log
   - ip a >/dev/tty1
diff --git a/roles/terraform/templates/libvirt-ubuntu.tf.j2 b/roles/terraform/templates/libvirt-ubuntu.tf.j2
index e890e3e..85b48e4 100644
--- a/roles/terraform/templates/libvirt-ubuntu.tf.j2
+++ b/roles/terraform/templates/libvirt-ubuntu.tf.j2
@@ -12,7 +12,7 @@ resource "libvirt_pool" "{{ each.name }}" {
 resource "libvirt_volume" "{{ each.name }}-tmp" {
   name   = "{{ each.name }}-tmp"
   pool   = libvirt_pool.{{ each.name }}.name
-  source = "https://cloud-images.ubuntu.com/releases/lunar/release/ubuntu-23.04-server-cloudimg-amd64.ova"
+  source = "https://cloud-images.ubuntu.com/releases/mantic/release/ubuntu-23.10-server-cloudimg-amd64.ova"
   format = "qcow2"
 }
 
diff --git a/roles/terraform/templates/rhel8-cloud.tpl.j2 b/roles/terraform/templates/rhel8-cloud.tpl.j2
index 9bd3cc6..25635b8 100644
--- a/roles/terraform/templates/rhel8-cloud.tpl.j2
+++ b/roles/terraform/templates/rhel8-cloud.tpl.j2
@@ -52,8 +52,6 @@ hostname: ${HOSTNAME}
 #  Write to a log file (useing variables set in terraform) and show the ip on the console.
 runcmd:
   - date >/root/cloudinit.log
-  - hostnamectl set-hostname ${HOSTNAME}
-  - dnf vim git install -y cockpit >>/root/cloudinit.log
   - systemctl enable --now cockpit >>/root/cloudinit.log
   - echo "Done cloud-init" >>/root/cloudinit.log
   - ip a >/dev/tty1
diff --git a/roles/terraform/templates/rhel9-cloud.tpl.j2 b/roles/terraform/templates/rhel9-cloud.tpl.j2
index 9bd3cc6..25635b8 100644
--- a/roles/terraform/templates/rhel9-cloud.tpl.j2
+++ b/roles/terraform/templates/rhel9-cloud.tpl.j2
@@ -52,8 +52,6 @@ hostname: ${HOSTNAME}
 #  Write to a log file (useing variables set in terraform) and show the ip on the console.
 runcmd:
   - date >/root/cloudinit.log
-  - hostnamectl set-hostname ${HOSTNAME}
-  - dnf vim git install -y cockpit >>/root/cloudinit.log
   - systemctl enable --now cockpit >>/root/cloudinit.log
   - echo "Done cloud-init" >>/root/cloudinit.log
   - ip a >/dev/tty1
diff --git a/roles/terraform/templates/ubuntu-cloud.tpl.j2 b/roles/terraform/templates/ubuntu-cloud.tpl.j2
index 0d64132..56c25f7 100644
--- a/roles/terraform/templates/ubuntu-cloud.tpl.j2
+++ b/roles/terraform/templates/ubuntu-cloud.tpl.j2
@@ -48,7 +48,6 @@ hostname: ${HOSTNAME}
 #  Write to a log file (useing variables set in terraform) and show the ip on the console.
 runcmd:
   - date >/root/cloudinit.log
-  - hostname ${HOSTNAME}
   - apt install -y vim git cockpit-system cockpit-networkmanager cockpit-tests cockpit-bridge cockpit cockpit-ws cockpit-dashboard cockpit-sosreport cockpit-packagekit cockpit-doc cockpit-storaged cockpit-pcp cockpit-389-ds >>/root/cloudinit.log
   - systemctl enable --now cockpit.service >>/root/cloudinit.log
   - echo "Done cloud-init" >>/root/cloudinit.log