diff --git a/README.md b/README.md
index 1c7d152..8ea36c4 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,13 @@
 
 This repository contains reusable Terraform modules for managing Proxmox infrastructure.
 
+*Modules in this repo are still in pre-1.0.0 version, so anything can change at any time.*
+
 ## Provider in use
 
-- [bpg/proxmox](https://registry.terraform.io/providers/bpg/proxmox/latest) For VMs, and image files.
-- [telmate/proxmox](https://registry.terraform.io/namespaces/Telmate) For LXC containers.
+- [bpg/proxmox](https://registry.terraform.io/providers/bpg/proxmox/latest).
 
-## Available Modules
+## Usage
 
 - [VM](proxmox/vm/) resource, [Example script](./usage/proxmox.vm.md).
 - [LXC](proxmox/lxc/) resource, [Example script](./usage/proxmox.lxc.md)
diff --git a/proxmox/lxc/README.md b/proxmox/lxc/README.md
index f1db3c8..f023e90 100644
--- a/proxmox/lxc/README.md
+++ b/proxmox/lxc/README.md
@@ -4,13 +4,17 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5.7 |
-| <a name="requirement_proxmox"></a> [proxmox](#requirement\_proxmox) | 3.0.1-rc6 |
+| <a name="requirement_local"></a> [local](#requirement\_local) | >= 2.5.1 |
+| <a name="requirement_proxmox"></a> [proxmox](#requirement\_proxmox) | 0.70.0 |
+| <a name="requirement_random"></a> [random](#requirement\_random) | 3.6.3 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_proxmox"></a> [proxmox](#provider\_proxmox) | 3.0.1-rc6 |
+| <a name="provider_local"></a> [local](#provider\_local) | >= 2.5.1 |
+| <a name="provider_proxmox"></a> [proxmox](#provider\_proxmox) | 0.70.0 |
+| <a name="provider_random"></a> [random](#provider\_random) | 3.6.3 |
 
 ## Modules
 
@@ -20,24 +24,28 @@ No modules.
 
 | Name | Type |
 |------|------|
-| [proxmox_lxc.lxc_container](https://registry.terraform.io/providers/telmate/proxmox/3.0.1-rc6/docs/resources/lxc) | resource |
+| [proxmox_virtual_environment_container.lxc_container](https://registry.terraform.io/providers/bpg/proxmox/0.70.0/docs/resources/virtual_environment_container) | resource |
+| [random_password.lxc_container_password](https://registry.terraform.io/providers/hashicorp/random/3.6.3/docs/resources/password) | resource |
+| [local_file.ssh_public_key](https://registry.terraform.io/providers/hashicorp/local/latest/docs/data-sources/file) | data source |
 
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_container_network_interface"></a> [container\_network\_interface](#input\_container\_network\_interface) | LXC container network interface name. Default value: `eth0`. | `string` | `"eth0"` | no |
-| <a name="input_disk_name"></a> [disk\_name](#input\_disk\_name) | Proxmox storage pool (disk name) where the VM's disk should be stored. | `string` | n/a | yes |
-| <a name="input_disk_size"></a> [disk\_size](#input\_disk\_size) | Disk size in Terrabyte (T), Gigabytes (G), Megabyte (M), or Kilobyte (K). For example, `8G` | `string` | n/a | yes |
-| <a name="input_host_bridge_network"></a> [host\_bridge\_network](#input\_host\_bridge\_network) | Default node's network device bridge. Default value: `vmbr0`. | `string` | `"vmbr0"` | no |
-| <a name="input_hostname"></a> [hostname](#input\_hostname) | LXC hostname. | `string` | n/a | yes |
-| <a name="input_ip_address"></a> [ip\_address](#input\_ip\_address) | For setting static DHCP IP, add an IPv4 with CIDR notation. For example 10.20.30.40/24. Default value `dhcp`. | `string` | `"dhcp"` | no |
-| <a name="input_lxc_template_file"></a> [lxc\_template\_file](#input\_lxc\_template\_file) | Name of the LXC container template file. For example: ubuntu-20.04-standard\_20.04-1\_amd64.tar.gz | `string` | n/a | yes |
-| <a name="input_lxc_template_path"></a> [lxc\_template\_path](#input\_lxc\_template\_path) | Storage name where the LXC template is located. For example, `local` or `local-lvm`. | `string` | n/a | yes |
-| <a name="input_password"></a> [password](#input\_password) | Container login password. | `string` | n/a | yes |
-| <a name="input_proxmox_node_name"></a> [proxmox\_node\_name](#input\_proxmox\_node\_name) | Proxmox node name where the container will be deployed. In a single-node environment, it's typically: `pve` | `string` | n/a | yes |
-| <a name="input_swap"></a> [swap](#input\_swap) | A number that sets the amount of swap memory available to the container. Default is `0`. | `number` | `0` | no |
-| <a name="input_tags"></a> [tags](#input\_tags) | Tags of the container in a single string and semicolon-delimited (e.g. `terraform;test`).. | `string` | `null` | no |
+| <a name="input_cpu_cores"></a> [cpu\_cores](#input\_cpu\_cores) | The number of CPU cores | `number` | `1` | no |
+| <a name="input_description"></a> [description](#input\_description) | Container description | `string` | `"Manage by Terraform"` | no |
+| <a name="input_disk_id"></a> [disk\_id](#input\_disk\_id) | Storage disk identifier (name) | `string` | n/a | yes |
+| <a name="input_disk_size"></a> [disk\_size](#input\_disk\_size) | The size of the root filesystem in gigabytes (defaults to 4). When set to 0 a directory or zfs/btrfs subvolume will be created. Requires datastore\_id to be set. | `string` | `"4"` | no |
+| <a name="input_firewall"></a> [firewall](#input\_firewall) | Whether this interface's firewall rules should be used | `bool` | `true` | no |
+| <a name="input_hostname"></a> [hostname](#input\_hostname) | Hostname to assign to the container | `string` | n/a | yes |
+| <a name="input_ip_config"></a> [ip\_config](#input\_ip\_config) | The IP configuration (default to dhcp) | `string` | `"dhcp"` | no |
+| <a name="input_memory"></a> [memory](#input\_memory) | The dedicated memory in megabytes | `number` | `1024` | no |
+| <a name="input_network_interface"></a> [network\_interface](#input\_network\_interface) | A network interface | `string` | `"eth0"` | no |
+| <a name="input_node_name"></a> [node\_name](#input\_node\_name) | The name of the node to assign the container to | `string` | n/a | yes |
+| <a name="input_os_type"></a> [os\_type](#input\_os\_type) | OS type: Alpine, Ubunt ...etc | `string` | `"unmanaged"` | no |
+| <a name="input_ssh_public_key_path"></a> [ssh\_public\_key\_path](#input\_ssh\_public\_key\_path) | Path to the local public key to be added to the default user's `.ssh/authorized_keys` file. | `string` | n/a | yes |
+| <a name="input_template_file_id"></a> [template\_file\_id](#input\_template\_file\_id) | The identifier for an OS template file. The ID format is <datastore\_id>:<content\_type>/<file\_name>, for example local:iso/jammy-server-cloudimg-amd64.tar.gz. | `string` | n/a | yes |
+| <a name="input_unprivileged"></a> [unprivileged](#input\_unprivileged) | Whether the container runs as unprivileged on the host | `bool` | `true` | no |
 
 ## Outputs
 
diff --git a/proxmox/lxc/main.tf b/proxmox/lxc/main.tf
index 5479034..a6f96d3 100644
--- a/proxmox/lxc/main.tf
+++ b/proxmox/lxc/main.tf
@@ -2,48 +2,81 @@ terraform {
   required_version = ">= 1.5.7"
   required_providers {
     proxmox = {
-      source  = "telmate/proxmox"
-      version = "3.0.1-rc6"
+      source  = "bpg/proxmox"
+      version = "0.70.0"
+    }
+    local = {
+      source  = "hashicorp/local"
+      version = ">= 2.5.1"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.6.3"
     }
   }
 }
 
-resource "proxmox_lxc" "lxc_container" {
-  target_node  = var.proxmox_node_name
-  hostname     = var.hostname
-  ostemplate   = "${var.lxc_template_path}:vztmpl/${var.lxc_template_file}"
-  password     = var.password
-  unprivileged = true
-  start        = true
-  tags         = var.tags
-  swap         = var.swap
-  onboot       = true
-
-  # Terraform will crash without rootfs defined
-  rootfs {
-    # To allow LXC containers use 'local' pool storage, run this command on the host:
-    # pvesm set local --content backup,images,iso,rootdir,snippets,vztmpl
-    storage = var.disk_name
-    size    = var.disk_size
+data "local_file" "ssh_public_key" {
+  filename = var.ssh_public_key_path
+}
+
+resource "proxmox_virtual_environment_container" "lxc_container" {
+  description = var.description
+
+  node_name = var.node_name
+  # vm_id     = 1234
+
+  initialization {
+    hostname = var.hostname
+
+    ip_config {
+      ipv4 {
+        address = var.ip_config
+      }
+    }
+
+    user_account {
+      keys = [
+        trimspace(data.local_file.ssh_public_key.content)
+      ]
+      # Password is set randomly. Use ssh for login and change the password
+      password = random_password.lxc_container_password.result
+
+    }
+  }
+
+  network_interface {
+    name     = var.network_interface
+    firewall = var.firewall
+  }
+
+  operating_system {
+    # template_file_id = proxmox_virtual_environment_download_file.latest_ubuntu_22_jammy_lxc_img.id
+    template_file_id = var.template_file_id
+    # Or you can use a volume ID, as obtained from a "pvesm list <storage>"
+    # template_file_id = "local:vztmpl/jammy-server-cloudimg-amd64.tar.gz"
+    type = var.os_type
   }
 
-  network {
-    name   = var.container_network_interface
-    bridge = var.host_bridge_network
-    ip     = var.ip_address
-    # gw     = The IPv4 address belonging to the network interface's default gateway.
+  cpu {
+    cores = var.cpu_cores
   }
 
-  # Additional LXC features. See provider docs:
-  # https://registry.terraform.io/providers/Telmate/proxmox/latest/docs/resources/lxc#lxc-with-advanced-features-enabled
-  #
-  #   features {
-  #     Allow running Docker on LXC.
-  #     IMPORTANT! These features will expose the host's syscall, procfs and sysfs to the client.
-  #     Know the implications of these actions before proceeding.
-  #     See <keyctl|nesting> in https://pve.proxmox.com/wiki/Linux_Container
-  #     keyctl  = true
-  #     nesting = true
-  #     }
+  memory {
+    swap      = 0
+    dedicated = var.memory
+  }
+
+  disk {
+    datastore_id = var.disk_id
+    size         = var.disk_size
+  }
+
+  unprivileged = var.unprivileged
+}
 
+resource "random_password" "lxc_container_password" {
+  length           = 16
+  override_special = "_%@"
+  special          = true
 }
diff --git a/proxmox/lxc/vars.tf b/proxmox/lxc/vars.tf
index 45782e9..c3e143a 100644
--- a/proxmox/lxc/vars.tf
+++ b/proxmox/lxc/vars.tf
@@ -1,65 +1,78 @@
-
-variable "proxmox_node_name" {
+variable "description" {
+  default     = "Manage by Terraform"
   type        = string
-  description = "Proxmox node name where the container will be deployed. In a single-node environment, it's typically: `pve`"
+  description = "Container description"
 }
 
-variable "hostname" {
+variable "node_name" {
   type        = string
-  description = "LXC hostname."
+  description = "The name of the node to assign the container to"
 }
 
-variable "lxc_template_file" {
+variable "hostname" {
   type        = string
-  description = "Name of the LXC container template file. For example: ubuntu-20.04-standard_20.04-1_amd64.tar.gz"
+  description = "Hostname to assign to the container"
 }
 
-variable "lxc_template_path" {
+variable "ip_config" {
+  default     = "dhcp"
   type        = string
-  description = "Storage name where the LXC template is located. For example, `local` or `local-lvm`."
+  description = "The IP configuration (default to dhcp)"
 }
 
-variable "password" {
+variable "network_interface" {
+  default     = "eth0"
   type        = string
-  description = "Container login password."
+  description = "A network interface"
 }
 
-variable "tags" {
-  default     = null
+variable "template_file_id" {
   type        = string
-  description = "Tags of the container in a single string and semicolon-delimited (e.g. `terraform;test`).."
+  description = "The identifier for an OS template file. The ID format is <datastore_id>:<content_type>/<file_name>, for example local:iso/jammy-server-cloudimg-amd64.tar.gz."
 }
 
-variable "swap" {
-  default     = 0
-  type        = number
-  description = "A number that sets the amount of swap memory available to the container. Default is `0`."
+variable "os_type" {
+  default     = "unmanaged"
+  type        = string
+  description = "OS type: Alpine, Ubunt ...etc"
 }
 
-variable "disk_name" {
+variable "disk_id" {
   type        = string
-  description = "Proxmox storage pool (disk name) where the VM's disk should be stored."
+  description = "Storage disk identifier (name)"
 }
 
 variable "disk_size" {
+  default     = "4"
   type        = string
-  description = "Disk size in Terrabyte (T), Gigabytes (G), Megabyte (M), or Kilobyte (K). For example, `8G`"
+  description = "The size of the root filesystem in gigabytes (defaults to 4). When set to 0 a directory or zfs/btrfs subvolume will be created. Requires datastore_id to be set."
 }
 
-variable "container_network_interface" {
-  default     = "eth0"
+variable "ssh_public_key_path" {
   type        = string
-  description = "LXC container network interface name. Default value: `eth0`."
+  description = "Path to the local public key to be added to the default user's `.ssh/authorized_keys` file."
 }
 
-variable "host_bridge_network" {
-  default     = "vmbr0"
-  type        = string
-  description = "Default node's network device bridge. Default value: `vmbr0`."
+variable "memory" {
+  default     = 1024
+  type        = number
+  description = "The dedicated memory in megabytes"
 }
 
-variable "ip_address" {
-  default     = "dhcp"
-  type        = string
-  description = "For setting static DHCP IP, add an IPv4 with CIDR notation. For example 10.20.30.40/24. Default value `dhcp`."
+variable "unprivileged" {
+  default     = true
+  type        = bool
+  description = "Whether the container runs as unprivileged on the host"
+}
+
+variable "firewall" {
+  default     = true
+  type        = bool
+  description = "Whether this interface's firewall rules should be used"
+}
+
+variable "cpu_cores" {
+  default     = 1
+  type        = number
+  description = "The number of CPU cores"
 }
diff --git a/proxmox/vm/README.md b/proxmox/vm/README.md
index 7148b3f..267593f 100644
--- a/proxmox/vm/README.md
+++ b/proxmox/vm/README.md
@@ -33,7 +33,7 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_cloud_image_info"></a> [cloud\_image\_info](#input\_cloud\_image\_info) | A list of strings as the following: <br/>  index 0 for storage pool (disk) name where the cloud image iso, img, qcow... etc is stored.<br/>  index 1 for cloud-image file name (it must end with `.img` extension)<br/>  For example: `cloud_image_info: ["local-lvm", "debian-12-generic.qcow2.img"]`. | `list(string)` | n/a | yes |
+| <a name="input_cloud_image_info"></a> [cloud\_image\_info](#input\_cloud\_image\_info) | A list of strings as the following:<br/>  index 0 for storage pool (disk) name where the cloud image iso, img, qcow... etc is stored.<br/>  index 1 for cloud-image file name (it must end with `.img` extension)<br/>  For example: `cloud_image_info: ["local-lvm", "debian-12-generic.qcow2.img"]`. | `list(string)` | n/a | yes |
 | <a name="input_cores"></a> [cores](#input\_cores) | The number of CPU cores. | `number` | `1` | no |
 | <a name="input_cpu_type"></a> [cpu\_type](#input\_cpu\_type) | The emulated CPU type. Some VMs need certain types of CPUs. See available values in https://registry.terraform.io/providers/bpg/proxmox/latest/docs/resources/virtual_environment_vm#host | `string` | `"qemu64"` | no |
 | <a name="input_description"></a> [description](#input\_description) | VM resource description. | `string` | `"Managed by Terraform"` | no |
@@ -46,7 +46,7 @@ No modules.
 | <a name="input_network_interface"></a> [network\_interface](#input\_network\_interface) | Default node's network device bridge. Default value: `vmbr0`. | `string` | `"vmbr0"` | no |
 | <a name="input_proxmox_node_name"></a> [proxmox\_node\_name](#input\_proxmox\_node\_name) | Proxmox node name. In a single-node environment, it's typically: `pve` | `string` | n/a | yes |
 | <a name="input_sockets"></a> [sockets](#input\_sockets) | The number of CPU sockets. | `number` | `1` | no |
-| <a name="input_ssh_public_key_path"></a> [ssh\_public\_key\_path](#input\_ssh\_public\_key\_path) | Path to the public SSH key to allow the default user SSH into the VM. | `string` | n/a | yes |
+| <a name="input_ssh_public_key_path"></a> [ssh\_public\_key\_path](#input\_ssh\_public\_key\_path) | Path to the local public key to be added to the default user's `.ssh/authorized_keys` file. | `string` | n/a | yes |
 | <a name="input_tags"></a> [tags](#input\_tags) | List of strings for tags. For example: ['terraform', 'ubuntu']. | `list(string)` | <pre>[<br/>  "terraform"<br/>]</pre> | no |
 | <a name="input_temp_user_password"></a> [temp\_user\_password](#input\_temp\_user\_password) | Temorary login password. Upon the first login, a prompt to change the password will be presented. | `string` | `"changeme"` | no |
 | <a name="input_timezone"></a> [timezone](#input\_timezone) | Timezone to be configured via `timedatectl` in cloud-init template. | `string` | n/a | yes |
diff --git a/proxmox/vm/vars.tf b/proxmox/vm/vars.tf
index c795e25..1a720a3 100644
--- a/proxmox/vm/vars.tf
+++ b/proxmox/vm/vars.tf
@@ -80,7 +80,7 @@ variable "network_interface" {
 variable "cloud_image_info" {
   type        = list(string)
   description = <<EOF
-  A list of strings as the following: 
+  A list of strings as the following:
   index 0 for storage pool (disk) name where the cloud image iso, img, qcow... etc is stored.
   index 1 for cloud-image file name (it must end with `.img` extension)
   For example: `cloud_image_info: ["local-lvm", "debian-12-generic.qcow2.img"]`.
@@ -89,7 +89,7 @@ variable "cloud_image_info" {
 
 variable "ssh_public_key_path" {
   type        = string
-  description = "Path to the public SSH key to allow the default user SSH into the VM."
+  description = "Path to the local public key to be added to the default user's `.ssh/authorized_keys` file."
 }
 
 variable "timezone" {
@@ -101,4 +101,4 @@ variable "cpu_type" {
   default     = "qemu64"
   type        = string
   description = "The emulated CPU type. Some VMs need certain types of CPUs. See available values in https://registry.terraform.io/providers/bpg/proxmox/latest/docs/resources/virtual_environment_vm#host"
-}
\ No newline at end of file
+}
diff --git a/usage/proxmox.cloud.img.md b/usage/proxmox.cloud.img.md
new file mode 100644
index 0000000..9d4d4ee
--- /dev/null
+++ b/usage/proxmox.cloud.img.md
@@ -0,0 +1,3 @@
+## Cloud Image Module Usate
+
+To be updated.
diff --git a/usage/proxmox.lxc.md b/usage/proxmox.lxc.md
index eeb1ba9..8c5bba2 100644
--- a/usage/proxmox.lxc.md
+++ b/usage/proxmox.lxc.md
@@ -1,61 +1,3 @@
 ## Proxmox LXC Module Usage
 
-This is a template for using the `proxmox/lxc` module. 
-For credentials, ensure you pass them securely and 
-avoid adding them in plain text.
-
-File: `providers.tf`
-
-```hcl
-terraform {
-  required_version = ">= 1.5.7"
-  backend "" {
-  }
-
-  required_providers {
-    proxmox = {
-      source  = "telmate/proxmox"
-      version = "3.0.1-rc6"
-    }
-  }
-}
-
-provider "proxmox" {
-  // Export the following environment variables to authenticate with proxmox:
-  # export PM_API_TOKEN_ID="<username>@pam!<tokenName>"
-  # export PM_API_TOKEN_SECRET="xxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx"
-  pm_api_url      = "https://PVE_IP_HERE:8006/api2/json"
-  pm_tls_insecure = true
-
-  # Enable the following attributes for debugging:
-  # pm_debug        = true
-  # pm_log_file     = "terraform-plugin-proxmox.log"
-  # pm_log_enable   = true
-  # pm_log_levels   = {
-  #   _default    = "debug"
-  #   _capturelog = ""
-  # }
-}
-```
-
-File: `main.tf`
-```hcl
-module "MODULE_NAME" {
-  # Required Variables
-  source            = "git::https://github.com/shakir85/terraform_modules.git//proxmox/lxc?ref=RELEADE_ID"
-  proxmox_node_name = ""
-  hostname          = ""
-  lxc_template_file = ""
-  lxc_template_path = ""
-  password          = ""
-  disk_name         = ""
-  disk_size         = ""
-
-  # Optinal Variables (default values presented below)
-  # tags                        = null
-  # swap                        = 0 (disabled)
-  # container_network_interface = "eth0"
-  # host_bridge_network         = "vmbr0"
-  # ip_address                  = "dhcp"
-}
-```
+To be updated.