31 changed files with 814 additions and 183 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -0,0 +1,86 @@
+kind: pipeline
+type: kubernetes
+name: 'Packer Build'
+    
+volumes:
+- name: output
+  claim:
+    name: flexvolsmb-drone-output
+- name: scratch
+  claim:
+    name: flexvolsmb-drone-scratch
+
+steps:
+- name: Debugging information
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  commands:
+  - yamllint --version
+  - packer --version
+  - ansible --version
+  - ovftool --version
+- name: Ubuntu Server 22.04
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  pull: always
+  commands:
+  - |
+    sed -i -e "s/<<img-password>>/$${SSH_PASSWORD}/g" \
+      packer/preseed/UbuntuServer22.04/user-data
+  - |
+    yamllint -d "{extends: relaxed, rules: {line-length: disable}}" \
+      ansible \
+      packer/preseed/UbuntuServer22.04/user-data \
+      scripts
+  - |
+    packer init -upgrade \
+      ./packer
+  - |
+    packer validate \
+      -var vm_name=$DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
+      -var vm_guestos=ubuntuserver22.04 \
+      -var repo_username=$${REPO_USERNAME} \
+      -var repo_password=$${REPO_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
+      ./packer
+  - |
+    packer build \
+      -on-error=cleanup -timestamp-ui \
+      -var vm_name=$DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
+      -var vm_guestos=ubuntuserver22.04 \
+      -var repo_username=$${REPO_USERNAME} \
+      -var repo_password=$${REPO_PASSWORD} \
+      -var vsphere_password=$${VSPHERE_PASSWORD} \
+      -var ssh_password=$${SSH_PASSWORD} \
+      ./packer
+  environment:
+    VSPHERE_PASSWORD:
+      from_secret: vsphere_password
+    SSH_PASSWORD:
+      from_secret: ssh_password
+    REPO_USERNAME:
+      from_secret: repo_username
+    REPO_PASSWORD:
+      from_secret: repo_password
+    # PACKER_LOG: 1
+  volumes:
+  - name: output
+    path: /output
+- name: Remove temporary resources
+  image: bv11-cr01.bessems.eu/library/packer-extended
+  commands:
+  - |
+    pwsh -file scripts/Remove-Resources.ps1 \
+      -VMName $DRONE_BUILD_NUMBER-${DRONE_COMMIT_SHA:0:10} \
+      -VSphereFQDN 'bv11-vc.bessems.lan' \
+      -VSphereUsername 'administrator@vsphere.local' \
+      -VSpherePassword $${VSPHERE_PASSWORD}
+  environment:
+    VSPHERE_PASSWORD:
+      from_secret: vsphere_password
+  volumes:
+  - name: scratch
+    path: /scratch
+  when:
+    status:
+    - success
+    - failure
--- a/README.md
+++ b/README.md
@ -1,15 +1 @@
-# Packer.Images
-
-Opinionated set of packer templates for producing .OVA appliances, which can then be deployed (semi)unattended through the use of vApp properties:
-
-##  [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/UbuntuServer20.04) **Ubuntu Server 20.04**](https://code.spamasaurus.com/djpbessems/Packer.Images/src/branch/UbuntuServer20.04) - <small>LTS</small>
-  Lorem ipsum.
-
-##  [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/Server2019) **Windows Server 2019**](https://code.spamasaurus.com/djpbessems/Packer.Images/src/branch/Server2019) - <small>LTSC xx09</small>
-  This image in itself does not actually provide much benefit over other customization methods that are available during an unattended deployment; it serves primarily as a basis for the following images.
-
-##  [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/ADDS) **ADDS**](https://code.spamasaurus.com/djpbessems/Packer.Images/src/branch/ADDS) - <small>Active Directory Domain Services</small>
-  Lorem ipsum.
-
-##  [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/ADCS) **ADCS**](https://code.spamasaurus.com/djpbessems/Packer.Images/src/branch/ADCS) - <small>Active Directory Certificate Services</small>
-  Lorem ipsum.
+# Packer.Images [![Build Status](https://ci.spamasaurus.com/api/badges/djpbessems/Packer.Images/status.svg?ref=refs/heads/UbuntuServer22.04)](https://ci.spamasaurus.com/djpbessems/Packer.Images)
--- a/ansible/ansible.cfg
+++ b/ansible/ansible.cfg
@ -0,0 +1,3 @@
+[defaults]
+deprecation_warnings = False
+remote_tmp           = /tmp/.ansible-${USER}/tmp
--- a/ansible/playbook.yml
+++ b/ansible/playbook.yml
@ -0,0 +1,7 @@
+---
+- hosts: all
+  gather_facts: false
+  become: true
+  roles:
+    - os
+    - firstboot
--- a/ansible/roles/firstboot/files/ansible_payload/playbook.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/playbook.yml
@ -0,0 +1,10 @@
+---
+- hosts: 127.0.0.1
+  connection: local
+  gather_facts: false
+  # become: true
+  roles:
+    - vapp
+    - network
+    - users
+    - cleanup
--- a/ansible/roles/firstboot/files/ansible_payload/roles/cleanup/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/cleanup/tasks/main.yml
@ -0,0 +1,20 @@
+- name: Disable crontab job
+  ansible.builtin.cron:
+    name: firstboot
+    state: absent
+- name: Restore extra tty
+  ansible.builtin.lineinfile:
+    path: /etc/systemd/logind.conf
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+  loop:
+  - { regexp: '^NAutoVTs=', line: '#NAutoVTs=6'}
+  - { regexp: '^ReserveVT=', line: '#ReserveVT=6'}
+- name: Unmask getty@tty1 service
+  ansible.builtin.systemd:
+    name: getty@tty1
+    enabled: yes
+    masked: no
+- name: Reboot host
+  ansible.builtin.shell:
+    cmd: /usr/sbin/reboot now
--- a/ansible/roles/firstboot/files/ansible_payload/roles/network/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/network/tasks/main.yml
@ -0,0 +1,10 @@
+- name: Set hostname
+  ansible.builtin.hostname:
+    name: "{{ ovfproperties['guestinfo.hostname'] }}"
+- name: Create netplan configuration file
+  ansible.builtin.template:
+    src: netplan.j2
+    dest: /etc/netplan/00-installer-config.yaml
+- name: Apply netplan configuration
+  ansible.builtin.shell:
+    cmd: /usr/sbin/netplan apply
--- a/ansible/roles/firstboot/files/ansible_payload/roles/network/templates/netplan.j2
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/network/templates/netplan.j2
@ -0,0 +1,10 @@
+network:
+  version: 2
+  ethernets:
+    ens192:
+      addresses:
+      - {{ ovfproperties['guestinfo.ipaddress'] }}/{{ ovfproperties['guestinfo.prefixlength'] }}
+      gateway4: {{ ovfproperties['guestinfo.gateway'] }}
+      nameservers:
+        addresses:
+        - {{ ovfproperties['guestinfo.dnsserver'] }}
--- a/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/users/tasks/main.yml
@ -0,0 +1,25 @@
+- name: Set root password
+  ansible.builtin.user:
+    name: root
+    password: "{{ ovfproperties['guestinfo.rootpw'] | password_hash('sha512', 65534 | random(seed=ovfproperties['guestinfo.hostname']) | string) }}"
+    generate_ssh_key: yes
+    ssh_key_bits: 2048
+    ssh_key_file: .ssh/id_rsa
+- name: Save root SSH publickey
+  ansible.builtin.lineinfile:
+    path: /root/.ssh/authorized_keys
+    line: "{{ ovfproperties['guestinfo.rootsshkey'] }}"
+- name: Disable SSH password authentication
+  ansible.builtin.lineinfile:
+    path: /etc/ssh/sshd_config
+    regex: "{{ item.regex }}"
+    line: "{{ item.line }}"
+    state: "{{ item.state }}"
+  loop:
+  - { regex: '^#PasswordAuthentication', line: 'PasswordAuthentication no', state: present}
+  - { regex: '^PasswordAuthentication yes', line: 'PasswordAuthentication yes', state: absent}
+- name: Delete 'ubuntu' user
+  ansible.builtin.user:
+    name: ubuntu
+    state: absent
+    remove: yes
--- a/ansible/roles/firstboot/files/ansible_payload/roles/vapp/tasks/main.yml
+++ b/ansible/roles/firstboot/files/ansible_payload/roles/vapp/tasks/main.yml
@ -0,0 +1,21 @@
+- name: Store current ovfEnvironment
+  ansible.builtin.shell:
+    cmd: /usr/bin/vmtoolsd --cmd "info-get guestinfo.ovfEnv"
+  register: ovfenv
+- name: Parse XML for vApp properties
+  community.general.xml:
+    xmlstring: "{{ ovfenv.stdout }}"
+    namespaces:
+      ns: http://schemas.dmtf.org/ovf/environment/1
+    xpath: /ns:Environment/ns:PropertySection/ns:Property
+    content: attribute
+  register: ovfenv
+- name: Assign vApp properties to dictionary
+  ansible.builtin.set_fact:
+    ovfproperties: >-
+      {{ ovfproperties | default({}) |
+      combine({((item.values() | list)[0].values() | list)[0]:
+      ((item.values() | list)[0].values() | list)[1]})
+      }}
+  loop: "{{ ovfenv.matches }}"
+  no_log: true
--- a/ansible/roles/firstboot/tasks/main.yml
+++ b/ansible/roles/firstboot/tasks/main.yml
@ -0,0 +1,26 @@
+- name: Create destination folder
+  ansible.builtin.file:
+    path: /opt/firstboot
+    state: directory
+- name: Create firstboot script file
+  ansible.builtin.template:
+    src: firstboot.j2
+    dest: /opt/firstboot/firstboot.sh
+    owner: root
+    group: root
+    mode: o+x
+- name: Create @reboot crontab job
+  ansible.builtin.cron:
+    name: firstboot
+    special_time: reboot
+    job: "/opt/firstboot/firstboot.sh"
+- name: Copy payload folder
+  ansible.builtin.copy:
+    src: ansible_payload/
+    dest: /opt/firstboot/ansible/
+    owner: root
+    group: root
+    mode: '0644'
+- name: Install ansible-galaxy collection
+  ansible.builtin.shell:
+    cmd: ansible-galaxy collection install community.general
--- a/ansible/roles/firstboot/templates/firstboot.j2
+++ b/ansible/roles/firstboot/templates/firstboot.j2
@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Apply firstboot configuration w/ ansible
+/usr/local/bin/ansible-playbook /opt/firstboot/ansible/playbook.yml | tee -a /var/log/firstboot.log > /dev/tty1
--- a/ansible/roles/os/tasks/ansible.yml
+++ b/ansible/roles/os/tasks/ansible.yml
@ -0,0 +1,6 @@
+- name: Install ansible (w/ dependencies)
+  ansible.builtin.pip:
+    name: "{{ item }}"
+    executable: pip3
+    state: latest
+  loop: "{{ pip_packages }}"
--- a/ansible/roles/os/tasks/cloud-init.yml
+++ b/ansible/roles/os/tasks/cloud-init.yml
@ -0,0 +1,12 @@
+- name: Delete cloud-init package
+  ansible.builtin.apt:
+    name: cloud-init
+    state: absent
+    purge: yes
+- name: Delete cloud-init files
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: absent
+  loop:
+    - /etc/cloud
+    - /var/lib/cloud
--- a/ansible/roles/os/tasks/logging.yml
+++ b/ansible/roles/os/tasks/logging.yml
@ -0,0 +1,5 @@
+- name: Enable crontab logging
+  ansible.builtin.lineinfile:
+    path: /etc/rsyslog.d/50-default.conf
+    regexp: '^#cron\.\*.*'
+    line: "cron.*\t\t\t\t./var/log/cron.log"
--- a/ansible/roles/os/tasks/main.yml
+++ b/ansible/roles/os/tasks/main.yml
@ -0,0 +1,20 @@
+- name: Disable tty logins
+  import_tasks: tty.yml
+
+- name: Remove snapd
+  import_tasks: snapd.yml
+
+- name: Remove cloud-init
+  import_tasks: cloud-init.yml
+
+- name: Configure default logging
+  import_tasks: logging.yml
+
+- name: Configure services
+  import_tasks: services.yml
+
+- name: Install packages
+  import_tasks: packages.yml
+
+- name: Install ansible
+  import_tasks: ansible.yml
--- a/ansible/roles/os/tasks/packages.yml
+++ b/ansible/roles/os/tasks/packages.yml
@ -0,0 +1,28 @@
+- name: Configure 'needrestart' package
+  ansible.builtin.lineinfile:
+    path: /etc/needrestart/needrestart.conf
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+  loop:
+    - regexp: "^#\\$nrconf\\{restart\\} = 'i';"
+      line: "$nrconf{restart} = 'a';"
+    - regexp: "^#\\$nrconf\\{kernelhints\\} = -1;"
+      line: "$nrconf{kernelhints} = -1;"
+
+- name: Install additional packages
+  ansible.builtin.apt:
+    name: "{{ item }}"
+    state: latest
+    update_cache: yes
+  loop: "{{ packages }}"
+
+- name: Upgrade all packages
+  ansible.builtin.apt:
+    name: "*"
+    state: latest
+    update_cache: yes
+
+- name: Cleanup
+  ansible.builtin.apt:
+    autoremove: yes
+    purge: yes
--- a/ansible/roles/os/tasks/services.yml
+++ b/ansible/roles/os/tasks/services.yml
@ -0,0 +1,5 @@
+- name: Disable & mask networkd-wait-online
+  ansible.builtin.systemd:
+    name: systemd-networkd-wait-online
+    enabled: no
+    masked: yes
--- a/ansible/roles/os/tasks/snapd.yml
+++ b/ansible/roles/os/tasks/snapd.yml
@ -0,0 +1,16 @@
+- name: Delete snapd package
+  ansible.builtin.apt:
+    name: snapd
+    state: absent
+    purge: yes
+- name: Delete leftover files
+  ansible.builtin.file:
+    path: /root/snap
+    state: absent
+- name: Hold snapd package
+  ansible.builtin.dpkg_selections:
+    name: snapd
+    selection: hold
+- name: Reload systemd unit configurations
+  ansible.builtin.systemd:
+    daemon_reload: yes
--- a/ansible/roles/os/tasks/tty.yml
+++ b/ansible/roles/os/tasks/tty.yml
@ -0,0 +1,13 @@
+- name: Disable extra tty
+  ansible.builtin.lineinfile:
+    path: /etc/systemd/logind.conf
+    regexp: "{{ item.regexp }}"
+    line: "{{ item.line }}"
+  loop:
+  - { regexp: '^#NAutoVTs=', line: 'NAutoVTs=1'}
+  - { regexp: '^#ReserveVT=', line: 'ReserveVT=11'}
+- name: Mask getty@tty1 service
+  ansible.builtin.systemd:
+    name: getty@tty1
+    enabled: no
+    masked: yes
--- a/ansible/roles/os/vars/main.yml
+++ b/ansible/roles/os/vars/main.yml
@ -0,0 +1,11 @@
+packages:
+  - jq
+  # (python3-*) Dependency for installation of Ansible
+  - python3-pip
+  - python3-setuptools
+  - python3-wheel
+
+pip_packages:
+  - pip
+  - ansible-core
+  - lxml
--- a/packer/iso.auto.pkrvars.hcl
+++ b/packer/iso.auto.pkrvars.hcl
@ -0,0 +1,4 @@
+iso_url      = "sn.itch.fyi/Repository/iso/Canonical/Ubuntu%20Server%2022.04/ubuntu-22.04-live-server-amd64.iso"
+iso_checksum = "sha256:84AEAF7823C8C61BAA0AE862D0A06B03409394800000B3235854A6B38EB4856F"
+// iso_url      = "sn.itch.fyi/Repository/iso/Canonical/Ubuntu%20Server%2020.04/ubuntu-20.04.2-live-server-amd64.iso"
+// iso_checksum = "sha256:D1F2BF834BBE9BB43FAF16F9BE992A6F3935E65BE0EDECE1DEE2AA6EB1767423"
--- a/packer/preseed/UbuntuServer22.04/meta-data
+++ b/packer/preseed/UbuntuServer22.04/meta-data
--- a/packer/preseed/UbuntuServer22.04/user-data
+++ b/packer/preseed/UbuntuServer22.04/user-data
@ -0,0 +1,29 @@
+#cloud-config
+autoinstall:
+  version: 1
+  locale: en_US
+  keyboard:
+    layout: en
+    variant: us
+  network:
+    network:
+      version: 2
+      ethernets:
+        ens192:
+          dhcp4: true
+          dhcp-identifier: mac
+  storage:
+    layout:
+      name: direct
+  identity:
+    hostname: packer-template
+    username: ubuntu
+    # password: $6$ZThRyfmSMh9499ar$KSZus58U/l58Efci0tiJEqDKFCpoy.rv25JjGRv5.iL33AQLTY2aljumkGiDAiX6LsjzVsGTgH85Tx4S.aTfx0
+    password: $6$rounds=4096$ZKfzRoaQOtc$M.fhOsI0gbLnJcCONXz/YkPfSoefP4i2/PQgzi2xHEi2x9CUhush.3VmYKL0XVr5JhoYvnLfFwqwR/1YYEqZy/
+  ssh:
+    install-server: yes
+    allow-pw: true
+  user-data:
+    disable_root: false
+  late-commands:
+    - echo 'ubuntu ALL=(ALL) NOPASSWD:ALL' > /target/etc/sudoers.d/ubuntu
--- a/packer/ubuntuserver22.04.pkr.hcl
+++ b/packer/ubuntuserver22.04.pkr.hcl
@ -0,0 +1,100 @@
+packer {
+  required_plugins {
+  }
+}
+
+source "vsphere-iso" "ubuntuserver" {
+  vcenter_server          = var.vcenter_server
+  username                = var.vsphere_username
+  password                = var.vsphere_password
+  insecure_connection     = "true"
+
+  vm_name                 = "${var.vm_guestos}-${var.vm_name}"
+  datacenter              = var.vsphere_datacenter
+  cluster                 = var.vsphere_cluster
+  host                    = var.vsphere_host
+  folder                  = var.vsphere_folder
+  datastore               = var.vsphere_datastore
+
+  guest_os_type           = "ubuntu64Guest"
+
+  boot_order              = "disk,cdrom"
+  boot_command            = [
+    "e<down><down><down><end>",
+    " autoinstall ds=nocloud;",
+    "<F10>"
+  ]
+  boot_wait               = "2s"
+
+  communicator            = "ssh"
+  ssh_username            = "ubuntu"
+  ssh_password            = var.ssh_password
+  ssh_timeout             = "20m"
+  ssh_handshake_attempts  = "100"
+  ssh_pty                 = true
+
+  CPUs                    = 2
+  RAM                     = 4096
+
+  network_adapters {
+    network               = var.vsphere_network
+    network_card          = "vmxnet3"
+  }
+  storage {
+    disk_size             = 20480
+    disk_thin_provisioned = true
+  }
+  disk_controller_type    = ["pvscsi"]
+  usb_controller          = ["xhci"]
+
+  cd_files                = [
+    "packer/preseed/UbuntuServer22.04/user-data",
+    "packer/preseed/UbuntuServer22.04/meta-data"
+  ]
+  cd_label                = "cidata"
+  iso_url                 = local.iso_authenticatedurl
+  iso_checksum            = var.iso_checksum
+
+  shutdown_command        = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
+  shutdown_timeout        = "5m"
+
+  export {
+    images                = false
+    output_directory      = "/scratch/ubuntuserver"
+  }
+  remove_cdrom            = true
+}
+
+build {
+  sources = [
+    "source.vsphere-iso.ubuntuserver"
+  ]
+
+  provisioner "ansible" {
+    only             = ["vsphere-iso.ubuntuserver"]
+
+    playbook_file    = "ansible/playbook.yml"
+    user             = "ubuntu"
+    ansible_env_vars = [
+      "ANSIBLE_CONFIG=ansible/ansible.cfg"
+    ]
+    use_proxy        = "false"
+    extra_arguments  = [
+      "--extra-vars", "ansible_ssh_pass=${var.ssh_password}"
+    ]
+  }
+
+  post-processor "shell-local" {
+    only   = ["vsphere-iso.ubuntuserver"]
+    inline = [
+      "pwsh -command \"& scripts/Update-OvfConfiguration.ps1 \\",
+      " -OVFFile '/scratch/ubuntuserver/${var.vm_guestos}-${var.vm_name}.ovf' \\",
+      " -Parameter @{'appliance.name'='${var.vm_guestos}';'appliance.version'='${var.vm_name}'}\"",
+      "pwsh -file scripts/Update-Manifest.ps1 \\",
+      " -ManifestFileName '/scratch/ubuntuserver/${var.vm_guestos}-${var.vm_name}.mf'",
+      "ovftool --acceptAllEulas --allowExtraConfig --overwrite \\",
+      " '/scratch/ubuntuserver/${var.vm_guestos}-${var.vm_name}.ovf' \\",
+      " /output/Ubuntu-Server-22.04.ova"
+    ]
+  }
+}
--- a/packer/variables.pkr.hcl
+++ b/packer/variables.pkr.hcl
@ -0,0 +1,31 @@
+variable "vcenter_server" {}
+variable "vsphere_username" {}
+variable "vsphere_password" {
+    sensitive = true
+}
+
+variable "vsphere_host" {}
+variable "vsphere_datacenter" {}
+variable "vsphere_cluster" {}
+
+variable "vsphere_templatefolder" {}
+variable "vsphere_folder" {}
+variable "vsphere_datastore" {}
+variable "vsphere_network" {}
+
+variable "vm_name" {}
+variable "vm_guestos" {}
+variable "ssh_password" {
+    sensitive = true
+}
+
+variable "iso_url" {}
+variable "iso_checksum" {}
+variable "repo_username" {}
+variable "repo_password" {
+    sensitive = true
+}
+local "iso_authenticatedurl" {
+    expression = "https://${var.repo_username}:${var.repo_password}@${var.iso_url}"
+    sensitive  = true
+}
--- a/packer/vsphere.auto.pkrvars.hcl
+++ b/packer/vsphere.auto.pkrvars.hcl
@ -1,9 +1,9 @@
 vcenter_server         = "bv11-vc.bessems.lan"
 vsphere_username       = "administrator@vsphere.local"
 vsphere_datacenter     = "DeSchakel"
+vsphere_cluster        = "Cluster.Legacy"
 vsphere_host           = "bv11-esx.bessems.lan"
-vsphere_hostip         = "192.168.11.200"
-vsphere_datastore      = "Datastore01.SSD"
+vsphere_datastore      = "ESX00.SSD01"
 vsphere_folder         = "/Packer"
 vsphere_templatefolder = "/Templates"
-vsphere_network        = "LAN"
+vsphere_network        = "LAN"
--- a/scripts/Copy-DatastoreItem.ps1
+++ b/scripts/Copy-DatastoreItem.ps1
@ -1,52 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory)]
-    [string]$VMName,
-    [Parameter(Mandatory)]
-    [string]$VSphereFQDN,
-    [Parameter(Mandatory)]
-    [string]$VSphereUsername,
-    [Parameter(Mandatory)]
-    [string]$VSpherePassword
-)
-
-$PowerCliConfigurationSplat = @{
-    Scope                    = 'User'
-    ParticipateInCEIP        = $False
-    Confirm                  = $False
-    InvalidCertificateAction = 'Ignore'
-}
-Set-PowerCLIConfiguration @PowerCliConfigurationSplat
-
-$ConnectVIServerSplat = @{
-    Server        = $VSphereFQDN
-    User          = "$VSphereUsername"
-    Password      = "$VSpherePassword"
-    WarningAction = 'SilentlyContinue'
-}
-Connect-VIServer @ConnectVIServerSplat | Out-Null
-
-$GetVMSplat = @{
-    Name = $VMName
-}
-$VM = Get-VM @GetVMSplat
-
-$GetHarddiskSplat = @{
-    VM = $VM
-}
-$Harddisk = Get-Harddisk @GetHarddiskSplat
-$VMFolder = ($Harddisk.Filename.Substring(0, $Harddisk.Filename.LastIndexOf('/')) -split ' ')[1]
-
-$NewDatastoreDriveSplat = @{
-    Name      = 'ds'
-    Datastore = ($VM | Get-Datastore)
-}
-New-DatastoreDrive @NewDatastoreDriveSplat
-
-$CopyDatastoreItemSplat = @{
-    Item        = "ds:\$($VMFolder)\*.vmdk"
-    Destination = (Get-Item $PWD)
-}
-Copy-DatastoreItem @CopyDatastoreItemSplat
-
-Disconnect-VIServer * -Confirm:$False
--- a/scripts/Remove-Resources.ps1
+++ b/scripts/Remove-Resources.ps1
@ -16,7 +16,7 @@ $PowerCliConfigurationSplat = @{
    Confirm                  = $False
    InvalidCertificateAction = 'Ignore'
 }
-Set-PowerCLIConfiguration @PowerCliConfigurationSplat
+Set-PowerCLIConfiguration @PowerCliConfigurationSplat | Out-Null

 $ConnectVIServerSplat = @{
    Server        = $VSphereFQDN
@ -26,14 +26,26 @@ $ConnectVIServerSplat = @{
 }
 Connect-VIServer @ConnectVIServerSplat | Out-Null

-$RemoveVMSplat = @{
-    VM                       = "$($VMName)*"
-    DeletePermanently        = $True
-    Confirm                  = $False
-    ErrorAction              = 'SilentlyContinue'
+$GetVMSplat = @{
+    Name        = "*$($VMName)*"
+    ErrorAction = 'SilentlyContinue'
+}
+If ([boolean](Get-VM @GetVMSplat)) {
+    $RemoveVMSplat = @{
+        VM                       = Get-VM @GetVMSplat
+        DeletePermanently        = $True
+        Confirm                  = $False
+        ErrorAction              = 'SilentlyContinue'
+    }
+    Remove-VM @RemoveVMSplat
 }
-Remove-VM @RemoveVMSplat

-# Also delete ISO/floppy?
+Disconnect-VIServer * -Confirm:$False

-Disconnect-VIServer * -Confirm:$False
+$RemoveItemSplat = @{
+    Path    = "/scratch/*"
+    Recurse = $True
+    Force   = $True
+    Confirm = $False
+}
+Remove-Item @RemoveItemSplat
--- a/scripts/Update-OvfConfiguration.ps1
+++ b/scripts/Update-OvfConfiguration.ps1
@ -1,15 +1,6 @@
 #Requires -Modules 'powershell-yaml'
 [CmdletBinding()]
 Param(
-    [Parameter(Mandatory)]
-    [ValidateScript({
-            If ([boolean]($_.IndexOfAny([io.path]::GetInvalidFileNameChars()) -lt 0)) {
-                $True
-            } Else {
-                Throw 'Provided input contains invalid characters; aborting.'
-            }
-        })]
-    [string]$TemplateName,
    [Parameter(Mandatory)]
    [ValidateScript({
            If (Test-Path($_)) {
@ -18,11 +9,12 @@ Param(
                Throw "'$_' is not a valid filename (within working directory '$PWD'), or access denied; aborting."
            }
        })]
-    [string]$OVFFile
+    [string]$OVFFile,
+    [hashtable]$Parameter
 )

 $GetContentSplat = @{
-    Path = "$($PSScriptRoot)\$($MyInvocation.MyCommand)".Replace('.ps1', ".$($TemplateName).yml")
+    Path = "$($PSScriptRoot)\$($MyInvocation.MyCommand)".Replace('.ps1', ".yml")
    Raw  = $True
 }
 $RawContent = Get-Content @GetContentSplat
@ -30,7 +22,24 @@ $ConvertFromYamlSplat = @{
    Yaml         = $RawContent
    AllDocuments = $True
 }
-$OVFConfig = ConvertFrom-Yaml @ConvertFromYamlSplat
+$YamlDocuments = ConvertFrom-Yaml @ConvertFromYamlSplat
+
+# Check if the respective .yml file declared substitutions which need to be parsed
+If (($YamlDocuments.Count -gt 1) -and $YamlDocuments[-1].Variables) {
+    ForEach ($Pattern in $YamlDocuments[-1].Variables) {
+        $RawContent = $RawContent -replace "\{\{ ($($Pattern.Name)) \}\}", [string](Invoke-Expression -Command $Pattern.Expression)
+    }
+    # Perform conversion to Yaml again, now with parsed file contents
+    $ConvertFromYamlSplat = @{
+        Yaml         = $RawContent
+        AllDocuments = $True
+    }
+    $YamlDocuments = ConvertFrom-Yaml @ConvertFromYamlSplat
+    $OVFConfig = $YamlDocuments[0..($YamlDocuments.Count - 2)]
+}
+Else {
+    $OVFConfig = $YamlDocuments
+}

 $SourceFile = Get-Item -Path $OVFFile
 $GetContentSplat = @{
@ -38,7 +47,77 @@ $GetContentSplat = @{
 }
 $XML = [xml](Get-Content @GetContentSplat)
 $NS = [System.Xml.XmlNamespaceManager]$XML.NameTable
-[void]$NS.AddNamespace('Any', $XML.DocumentElement.xmlns)
+[void]$NS.AddNamespace('ns', $XML.DocumentElement.xmlns)
+[void]$NS.AddNamespace('ovf', $XML.DocumentElement.ovf)
+[void]$NS.AddNamespace('rasd', $XML.DocumentElement.rasd)
+[void]$NS.AddNamespace('vmw', $XML.DocumentElement.vmw)
+
+# Create copy of existing 'Item/ResourceType'=17 (=Hard disk) node
+$XMLDiskTemplate = $XML.SelectSingleNode("//ns:VirtualHardwareSection/ns:Item/rasd:ResourceType[.='17']", $NS).ParentNode.CloneNode($True)
+
+ForEach ($Disk in $OVFConfig.DynamicDisks) {
+    # Determine next free available 'diskId'
+    $XMLDisks = $XML.SelectNodes("//ns:DiskSection/ns:Disk[contains(@ovf:diskId,'vmdisk')]", $NS)
+    $DiskId = 1
+    While ($XMLDisks.DiskId -contains "vmdisk$($DiskId)") {
+        $DiskId++
+    }
+
+    # Add new 'Disk' node (under 'DiskSection')
+    $XMLDisk = $XML.CreateElement('Disk', $XML.DocumentElement.xmlns)
+    $PowersMap = @{
+        KB = 10
+        MB = 20
+        GB = 30
+        TB = 40
+        PB = 50
+    }
+    If ($PowersMap.Keys -notcontains $Disk.UnitSize) {
+        # Invalid UnitSize; skipping adding new disk
+        Continue
+    }
+
+    [void]$XMLDisk.SetAttribute('capacityAllocationUnits', $NS.LookupNamespace('ovf'), "byte * 2^$($PowersMap[$Disk.UnitSize])")
+    [void]$XMLDisk.SetAttribute('format', $NS.LookupNamespace('ovf'), 'http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized')
+    [void]$XMLDisk.SetAttribute('diskId', $NS.LookupNamespace('ovf'), "vmdisk$($DiskId)")
+    [void]$XMLDisk.SetAttribute('capacity', $NS.LookupNamespace('ovf'), '${{vmconfig.disksize.{0}}}' -f $DiskId)
+    [void]$XMLDisk.SetAttribute('populatedSize', $NS.LookupNamespace('ovf'), 0)
+    [void]$XML.SelectSingleNode('//ns:DiskSection', $NS).AppendChild($XMLDisk)
+
+    # Add new 'Item/ResourceType' node (under 'VirtualHardwareSection')
+    $XMLDiskItem = $XMLDiskTemplate.CloneNode($True)
+    $XMLDiskItem.SelectSingleNode('rasd:AddressOnParent', $NS).InnerText = ($DiskId - 1)
+    $XMLDiskItem.SelectSingleNode('rasd:ElementName', $NS).InnerText = "Hard Disk $($DiskId)"
+    $XMLDiskItem.SelectSingleNode('rasd:HostResource', $NS).InnerText = "ovf:/disk/vmdisk$($DiskId)"
+    # Determine next free available and highest 'InstanceID'
+    $InstanceIDs = $XML.SelectNodes('//ns:VirtualHardwareSection/ns:Item/rasd:InstanceID', $NS).InnerText
+    $InstanceID = 1
+    While ($InstanceIDs -contains $InstanceID) {
+        $InstanceID++
+    }
+    $HighestInstanceID = ($InstanceIDs | Measure-Object -Maximum).Maximum
+    $XMLDiskItem.SelectSingleNode('rasd:InstanceID', $NS).InnerText = $InstanceID
+    [void]$XML.SelectSingleNode('//ns:VirtualHardwareSection', $NS).InsertAfter(
+        $XMLDiskItem,
+        $XML.SelectSingleNode("//ns:VirtualHardwareSection/ns:Item/rasd:InstanceID[.='$($HighestInstanceID)']", $NS).ParentNode
+    )
+
+    $OVFConfig.PropertyCategories[0].ProductProperties += @{
+        Key              = "vmconfig.disksize.$($DiskId)"
+        Type             = If ([boolean]$Disk.Constraints.Minimum -or [boolean]$Disk.Constraints.Maximum) {
+                "Int($($Disk.Constraints.Minimum)..$($Disk.Constraints.Maximum))"
+            }
+            Else {
+                'Int'
+            }
+        Label            = "Disk $($DiskId) size*"
+        Description      = "$($Disk.Description) (in $($Disk.UnitSize))".Trim()
+        DefaultValue     = "$($Disk.Constraints.Minimum)"
+        Configurations   = '*'
+        UserConfigurable = 'true'
+    }
+}
+Write-Host "Inserted $($OVFConfig.DynamicDisks.Count) new node(s) into 'DiskSection' and 'VirtualHardwareSection' respectively"

 If ($OVFConfig.DeploymentConfigurations.Count -gt 0) {
    $XMLSection = $XML.CreateElement('DeploymentOptionSection', $XML.DocumentElement.xmlns)
@ -49,36 +128,72 @@ If ($OVFConfig.DeploymentConfigurations.Count -gt 0) {
    ForEach ($Configuration in $OVFConfig.DeploymentConfigurations) {
        $XMLConfig = $XML.CreateElement('Configuration', $XML.DocumentElement.xmlns)
    
-        $XMLConfigAttrId = $XML.CreateAttribute('id', $XML.DocumentElement.ovf)
-        $XMLConfigAttrId.Value = $Configuration.Id
+        [void]$XMLConfig.SetAttribute('id', $NS.LookupNamespace('ovf'), $Configuration.Id)
    
        $XMLConfigLabel = $XML.CreateElement('Label', $XML.DocumentElement.xmlns)
        $XMLConfigLabel.InnerText = $Configuration.Label
-    
        $XMLConfigDescription = $XML.CreateElement('Description', $XML.DocumentElement.xmlns)
        $XMLConfigDescription.InnerText = $Configuration.Description
    
-        [void]$XMLConfig.Attributes.Append($XMLConfigAttrId)
        [void]$XMLConfig.AppendChild($XMLConfigLabel)
        [void]$XMLConfig.AppendChild($XMLConfigDescription)
    
        [void]$XMLSection.AppendChild($XMLConfig)
    }
-    [void]$XML.SelectSingleNode('//Any:Envelope', $NS).InsertAfter($XMLSection, $XML.SelectSingleNode('//Any:NetworkSection', $NS))
+    [void]$XML.SelectSingleNode('//ns:Envelope', $NS).InsertAfter($XMLSection, $XML.SelectSingleNode('//ns:NetworkSection', $NS))
    Write-Host "Inserted 'DeploymentOptionSection' with $($Configuration.Count) nodes"
+
+    If ($OVFConfig.DeploymentConfigurations.Count -eq $OVFConfig.DeploymentConfigurations.Size.Count) {
+        # Create copies of existing 'Item/ResourceType' nodes
+        $XMLCPUTemplate = $XML.SelectSingleNode("//ns:VirtualHardwareSection/ns:Item/rasd:ResourceType[.='3']", $NS).ParentNode.CloneNode($True)
+        $XMLMemoryTemplate = $XML.SelectSingleNode("//ns:VirtualHardwareSection/ns:Item/rasd:ResourceType[.='4']", $NS).ParentNode.CloneNode($True)
+        # Delete existing nodes
+        ForEach ($Node in $XML.SelectNodes("//ns:VirtualHardwareSection/ns:Item/rasd:ResourceType[.='3' or .='4']", $NS).ParentNode) {
+            [void]$Node.ParentNode.RemoveChild($Node)
+        }
+        # Add adjusted 'Item/ResourceType' nodes
+        ForEach ($Configuration in $OVFConfig.DeploymentConfigurations) {
+            $XMLCPU = $XMLCPUTemplate.CloneNode($True)
+            [void]$XMLCPU.SetAttribute('configuration', $NS.LookupNamespace('ovf'), $Configuration.Id)
+            $XMLCPU.SelectSingleNode('rasd:ElementName', $NS).InnerText = '{0} virtual CPU(s)' -f $Configuration.Size.CPU
+            $XMLCPU.SelectSingleNode('rasd:VirtualQuantity', $NS).InnerText = $Configuration.Size.CPU
+
+            $XMLMemory = $XMLMemoryTemplate.CloneNode($True)
+            [void]$XMLMemory.SetAttribute('configuration', $NS.LookupNamespace('ovf'), $Configuration.Id)
+            $XMLMemory.SelectSingleNode('rasd:ElementName', $NS).InnerText = '{0}MB of memory' -f $Configuration.Size.Memory
+            $XMLMemory.SelectSingleNode('rasd:VirtualQuantity', $NS).InnerText = $Configuration.Size.Memory
+
+            [void]$XML.SelectSingleNode('//ns:VirtualHardwareSection', $NS).InsertAfter(
+                $XMLCPU,
+                $XML.SelectSingleNode('//ns:VirtualHardwareSection/ns:System', $NS)
+            )
+            [void]$XML.SelectSingleNode('//ns:VirtualHardwareSection', $NS).InsertAfter(
+                $XMLMemory,
+                $XML.SelectSingleNode('//ns:VirtualHardwareSection/ns:System', $NS)
+            )
+        }
+    }
 }

-$XMLAttrTransport = $XML.CreateAttribute('transport', $XML.DocumentElement.ovf)
-$XMLAttrTransport.Value = 'com.vmware.guestInfo'
-[void]$XML.SelectSingleNode('//Any:VirtualHardwareSection', $NS).Attributes.Append($XMLAttrTransport)
+[void]$XML.SelectSingleNode('//ns:VirtualHardwareSection', $NS).SetAttribute('transport', $NS.LookupNamespace('ovf'), 'com.vmware.guestInfo')
+ForEach ($ExtraConfig in $OVFConfig.AdvancedOptions) {
+    $XMLExtraConfig = $XML.CreateElement('vmw:ExtraConfig', $XML.DocumentElement.vmw)

-$XMLProductSection = $XML.SelectSingleNode('//Any:ProductSection', $NS)
+    [void]$XMLExtraConfig.SetAttribute('required', $NS.LookupNamespace('ovf'), "$([boolean]$ExtraConfig.Required)".ToLower())
+    [void]$XMLExtraConfig.SetAttribute('key', $NS.LookupNamespace('vmw'), $ExtraConfig.Key)
+    [void]$XMLExtraConfig.SetAttribute('value', $NS.LookupNamespace('vmw'), $ExtraConfig.Value)
+
+    [void]$XML.SelectSingleNode('//ns:VirtualHardwareSection', $NS).AppendChild($XMLExtraConfig)
+}
+Write-Host "Added $($OVFConfig.AdvancedOptions.Count) 'vmw:ExtraConfig' node(s)"
+
+$XMLProductSection = $XML.SelectSingleNode('//ns:ProductSection', $NS)
 If ($XMLProductSection -eq $Null) {
    $XMLProductSection = $XML.CreateElement('ProductSection', $XML.DocumentElement.xmlns)
-    [void]$XML.SelectSingleNode('//Any:VirtualSystem', $NS).AppendChild($XMLProductSection)
+    [void]$XML.SelectSingleNode('//ns:VirtualSystem', $NS).AppendChild($XMLProductSection)
    Write-Host "Inserted 'ProductSection'"
 } Else {
-    ForEach ($Child in $XMLProductSection.SelectNodes('//Any:ProductSection/child::*', $NS)) {
+    ForEach ($Child in $XMLProductSection.SelectNodes('//ns:ProductSection/child::*', $NS)) {
        [void]$Child.ParentNode.RemoveChild($Child)
    }
    Write-Host "Destroyed pre-existing children in 'ProductSection'"
@ -99,85 +214,65 @@ ForEach ($Category in $OVFConfig.PropertyCategories) {
    ForEach ($Property in $Category.ProductProperties) {
        $XMLProperty = $XML.CreateElement('Property', $XML.DocumentElement.xmlns)
    
-        $XMLPropertyAttrKey = $XML.CreateAttribute('key', $XML.DocumentElement.ovf)
-        $XMLPropertyAttrKey.Value = $Property.Key
-        $XMLPropertyAttrType = $XML.CreateAttribute('type', $XML.DocumentElement.ovf)
+        [void]$XMLProperty.SetAttribute('key', $NS.LookupNamespace('ovf'), $Property.Key)
        Switch -regex ($Property.Type) {
-            'boolean' {
-                $XMLPropertyAttrType.Value = 'boolean'
+            '^boolean' {
+                [void]$XMLProperty.SetAttribute('type', $NS.LookupNamespace('ovf'), 'boolean')
            }
-            'int' {
-                $XMLPropertyAttrType.Value = 'uint8'
+            '^int' {
+                [void]$XMLProperty.SetAttribute('type', $NS.LookupNamespace('ovf'), 'uint16')
                $Qualifiers = @()
-                If ($Property.Type -match 'int\((\d*)\.\.(\d*)\)') {
+                If ($Property.Type -match '^int\((\d*)\.\.(\d*)\)') {
                    If ($Matches[1]) {
                        $Qualifiers += "MinValue($($Matches[1]))"
                    }
                    If ($Matches[2]) {
                        $Qualifiers += "MaxValue($($Matches[2]))"
                    }
-                    $XMLPropertyAttrQualifiers = $XML.CreateAttribute('qualifiers', $XML.DocumentElement.ovf)
-                    $XMLPropertyAttrQualifiers.Value = $Qualifiers -join ' '
-                    [void]$XMLProperty.Attributes.Append($XMLPropertyAttrQualifiers)
+                    [void]$XMLProperty.SetAttribute('qualifiers', $NS.LookupNamespace('ovf'), $Qualifiers -join ' ')
                }
            }
-            'ip' {
-                $XMLPropertyAttrType.Value = 'string'
-                $XMLPropertyAttrQualifiers = $XML.CreateAttribute('qualifiers', $XML.DocumentElement.vmw)
-                $XMLPropertyAttrQualifiers.Value = 'Ip'
-                [void]$XMLProperty.Attributes.Append($XMLPropertyAttrQualifiers)
+            '^ip' {
+                [void]$XMLProperty.SetAttribute('type', $NS.LookupNamespace('ovf'), 'string')
+                [void]$XMLProperty.SetAttribute('qualifiers', $NS.LookupNamespace('vmw'), 'Ip')
            }
-            'password' {
-                $XMLPropertyAttrType.Value = 'string'
-                $XMLPropertyAttrPassword = $XML.CreateAttribute('password', $XML.DocumentElement.ovf)
-                $XMLPropertyAttrPassword.Value = 'true'
-                [void]$XMLProperty.Attributes.Append($XMLPropertyAttrPassword)
+            '^password' {
+                [void]$XMLProperty.SetAttribute('type', $NS.LookupNamespace('ovf'), 'string')
+                [void]$XMLProperty.SetAttribute('password', $NS.LookupNamespace('ovf'), 'true')
+                $Qualifiers = @()
+                If ($Property.Type -match '^password\((\d*)\.\.(\d*)\)') {
+                    If ($Matches[1]) {
+                        $Qualifiers += "MinLen($($Matches[1]))"
+                    }
+                    If ($Matches[2]) {
+                        $Qualifiers += "MaxLen($($Matches[2]))"
+                    }
+                    [void]$XMLProperty.SetAttribute('qualifiers', $NS.LookupNamespace('ovf'), $Qualifiers -join ' ')
+                }
+            }
+            '^string' {
+                [void]$XMLProperty.SetAttribute('type', $NS.LookupNamespace('ovf'), 'string')
+                $Qualifiers = @()
+                If ($Property.Type -match '^string\((\d*)\.\.(\d*)\)') {
+                    If ($Matches[1]) {
+                        $Qualifiers += "MinLen($($Matches[1]))"
+                    }
+                    If ($Matches[2]) {
+                        $Qualifiers += "MaxLen($($Matches[2]))"
+                    }
+                    [void]$XMLProperty.SetAttribute('qualifiers', $NS.LookupNamespace('ovf'), $Qualifiers -join ' ')
+                } ElseIf ($Property.Type -match '^string\[(.*)\]') {
+                    [void]$XMLProperty.SetAttribute('qualifiers', $NS.LookupNamespace('ovf'), "ValueMap{$($Matches[1] -replace '","', '", "')}")
+                }
+            }
+        }
+        [void]$XMLProperty.SetAttribute('userConfigurable', $NS.LookupNamespace('ovf'), "$([boolean]$Property.UserConfigurable)".ToLower())

-                $Qualifiers = @()
-                If ($Property.Type -match 'password\((\d*)\.\.(\d*)\)') {
-                    If ($Matches[1]) {
-                        $Qualifiers += "MinLen($($Matches[1]))"
-                    }
-                    If ($Matches[2]) {
-                        $Qualifiers += "MaxLen($($Matches[2]))"
-                    }
-                    $XMLPropertyAttrQualifiers = $XML.CreateAttribute('qualifiers', $XML.DocumentElement.ovf)
-                    $XMLPropertyAttrQualifiers.Value = $Qualifiers -join ' '
-                    [void]$XMLProperty.Attributes.Append($XMLPropertyAttrQualifiers)
-                }
-            }
-            'string' {
-                $XMLPropertyAttrType.Value = 'string'
-                $Qualifiers = @()
-                If ($Property.Type -match 'string\((\d*)\.\.(\d*)\)') {
-                    If ($Matches[1]) {
-                        $Qualifiers += "MinLen($($Matches[1]))"
-                    }
-                    If ($Matches[2]) {
-                        $Qualifiers += "MaxLen($($Matches[2]))"
-                    }
-                    $XMLPropertyAttrQualifiers = $XML.CreateAttribute('qualifiers', $XML.DocumentElement.ovf)
-                    $XMLPropertyAttrQualifiers.Value = $Qualifiers -join ' '
-                    [void]$XMLProperty.Attributes.Append($XMLPropertyAttrQualifiers)
-                } ElseIf ($Property.Type -match 'string\[(.*)\]') {
-                    $XMLPropertyAttrQualifiers = $XML.CreateAttribute('qualifiers', $XML.DocumentElement.ovf)
-                    $XMLPropertyAttrQualifiers.Value = "ValueMap{$($Matches[1] -replace '","', '", "')}"
-                    [void]$XMLProperty.Attributes.Append($XMLPropertyAttrQualifiers)
-                }
-            }
-        }
-        $XMLPropertyAttrUserConfigurable = $XML.CreateAttribute('userConfigurable', $XML.DocumentElement.ovf)
-        $XMLPropertyAttrUserConfigurable.Value = "$([boolean]$Property.UserConfigurable)".ToLower()
-        $XMLPropertyAttrValue = $XML.CreateAttribute('value', $XML.DocumentElement.ovf)
        If ($Property.Type -eq 'boolean') {
-            $XMLPropertyAttrValue.Value = "$([boolean]$Property.DefaultValue)".ToLower()
+            [void]$XMLProperty.SetAttribute('value', $NS.LookupNamespace('ovf'), "$([boolean]$Property.DefaultValue)".ToLower())
        } Else {
-            $XMLPropertyAttrValue.Value = $Property.DefaultValue
+            [void]$XMLProperty.SetAttribute('value', $NS.LookupNamespace('ovf'), $Property.DefaultValue)
        }
-        [void]$XMLProperty.Attributes.Append($XMLPropertyAttrKey)
-        [void]$XMLProperty.Attributes.Append($XMLPropertyAttrType)
-        [void]$XMLProperty.Attributes.Append($XMLPropertyAttrUserConfigurable)
-        [void]$XMLProperty.Attributes.Append($XMLPropertyAttrValue)

        If ($Property.Label) {
            $XMLPropertyLabel = $XML.CreateElement('Label', $XML.DocumentElement.xmlns)
@ -191,30 +286,19 @@ ForEach ($Category in $OVFConfig.PropertyCategories) {
        }

        If (($Property.Configurations.Count -eq 1) -and ($Property.Configurations -eq '*')) {
-            $XMLPropertyAttrConfiguration = $XML.CreateAttribute('configuration', $XML.DocumentElement.ovf)
-            $XMLPropertyAttrConfiguration.Value = $OVFConfig.DeploymentConfigurations.Id -join ' '
-            [void]$XMLProperty.Attributes.Append($XMLPropertyAttrConfiguration)       
+            [void]$XMLProperty.SetAttribute('configuration', $NS.LookupNamespace('ovf'), $OVFConfig.DeploymentConfigurations.Id -join ' ')
        } ElseIf ($Property.Configurations.Count -gt 0) {
-            $XMLPropertyAttrConfiguration = $XML.CreateAttribute('configuration', $XML.DocumentElement.ovf)
-            $XMLPropertyAttrConfiguration.Value = $Property.Configurations -join ' '
-            [void]$XMLProperty.Attributes.Append($XMLPropertyAttrConfiguration)       
+            [void]$XMLProperty.SetAttribute('configuration', $NS.LookupNamespace('ovf'), $Property.Configurations -join ' ')
        }

        If ($Property.Value.Count -eq 1) {
-            $XMLPropertyAttrValue = $XML.CreateAttribute('value', $XML.DocumentElement.ovf)
-            $XMLPropertyAttrValue.Value = $Property.Value
-            [void]$XMLProperty.Attributes.Append($XMLPropertyAttrValue)       
+            [void]$XMLProperty.SetAttribute('value', $NS.LookupNamespace('ovf'), $Property.Value)
        } ElseIf ($Property.Value.Count -gt 1) {
            ForEach ($Value in $Property.Value) {
                $XMLValue = $XML.CreateElement('Value', $XML.DocumentElement.xmlns)

-                $XMLValueAttrValue = $XML.CreateAttribute('value', $XML.DocumentElement.ovf)
-                $XMLValueAttrValue.Value = $Value
-                $XMLValueAttrConfiguration = $XML.CreateAttribute('configuration', $XML.DocumentElement.ovf)
-                $XMLValueAttrConfiguration.Value = $Value
-
-                [void]$XMLValue.Attributes.Append($XMLValueAttrValue)
-                [void]$XMLValue.Attributes.Append($XMLValueAttrConfiguration)
+                [void]$XMLValue.SetAttribute('value', $NS.LookupNamespace('ovf'), $Value)
+                [void]$XMLValue.SetAttribute('configuration', $NS.LookupNamespace('ovf'), $Value)

                [void]$XMLProperty.AppendChild($XMLValue)
            }
@ -225,4 +309,4 @@ ForEach ($Category in $OVFConfig.PropertyCategories) {
    Write-Host "Inserted $($Category.ProductProperties.Count) new node(s) into 'ProductSection'"
 }

-$XML.Save($SourceFile.FullName)
+$XML.Save($SourceFile.FullName)
--- a/scripts/Update-OvfConfiguration.yml
+++ b/scripts/Update-OvfConfiguration.yml
@ -0,0 +1,99 @@
+DeploymentConfigurations:
+- Id: small
+  Label: 'Ubuntu Server 20.04 [SMALL: 1 vCPU/2GB RAM]'
+  Description: Ubuntu Server 20.04.x
+  Size:
+    CPU: 1
+    Memory: 2048
+- Id: large
+  Label: 'Ubuntu Server 20.04 [LARGE: 4 vCPU/8GB RAM]'
+  Description: Ubuntu Server 20.04.x
+  Size:
+    CPU: 4
+    Memory: 8192
+DynamicDisks: []
+PropertyCategories:
+# - Name: 0) Deployment information
+#   ProductProperties:
+#   - Key: deployment.type
+#     Type: string
+#     Value:
+#     - small
+#     - large
+#     UserConfigurable: false
+- Name: 1) Operating System
+  ProductProperties:
+  - Key: guestinfo.hostname
+    Type: string(1..15)
+    Label: Hostname*
+    Description: '(max length: 15 characters)'
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+  - Key: guestinfo.rootpw
+    Type: password(7..)
+    Label: Local root password*
+    Description: ''
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+  - Key: guestinfo.rootsshkey
+    Type: password(1..)
+    Label: Local root SSH public key*
+    Description: This line should start with 'ssh-rsa AAAAB3N'
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+  - Key: guestinfo.ntpserver
+    Type: string(1..)
+    Label: Time server*
+    Description: A comma-separated list of timeservers
+    DefaultValue: 0.pool.ntp.org,1.pool.ntp.org,2.pool.ntp.org
+    Configurations: '*'
+    UserConfigurable: true
+- Name: 2) Networking
+  ProductProperties:
+  - Key: guestinfo.ipaddress
+    Type: ip
+    Label: IP Address*
+    Description: ''
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+  - Key: guestinfo.prefixlength
+    Type: int(8..32)
+    Label: Subnet prefix length*
+    Description: ''
+    DefaultValue: '24'
+    Configurations: '*'
+    UserConfigurable: true
+  - Key: guestinfo.dnsserver
+    Type: ip
+    Label: DNS server*
+    Description: ''
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+  - Key: guestinfo.gateway
+    Type: ip
+    Label: Gateway*
+    Description: ''
+    DefaultValue: ''
+    Configurations: '*'
+    UserConfigurable: true
+AdvancedOptions:
+- Key: appliance.name
+  Value: "{{ appliance.name }}"
+  Required: false
+- Key: appliance.version
+  Value: "{{ appliance.version }}"
+  Required: false
+
+---
+Variables:
+- Name: appliance.name
+  Expression: |
+    $Parameter['appliance.name']
+- Name: appliance.version
+  Expression: |
+    $Parameter['appliance.version']