diff --git a/aws/opsverse-eks-iam/eks.tf b/aws/opsverse-eks-iam/eks.tf
index 182cdf5..1c5ee40 100644
--- a/aws/opsverse-eks-iam/eks.tf
+++ b/aws/opsverse-eks-iam/eks.tf
@@ -7,9 +7,27 @@ provider "aws" {
   region = var.aws_region
 }
 
+data "aws_eks_cluster" "default" {
+  name = module.opsverse-eks-cluster.cluster_id
+}
+
+data "aws_eks_cluster_auth" "default" {
+  name = module.opsverse-eks-cluster.cluster_id
+}
+
+provider "kubernetes" {
+  host                   = module.opsverse-eks-cluster.cluster_endpoint
+  cluster_ca_certificate = base64decode(module.opsverse-eks-cluster.cluster_certificate_authority_data)
+  token                  = data.aws_eks_cluster_auth.default.token
+}
+
+data "aws_availability_zones" "available" {}
+
+data "aws_caller_identity" "current" {}
+
 module "opsverse-eks-cluster" {
   source  = "terraform-aws-modules/eks/aws"
-  version = "19.21.0"
+  version = "~> 18.20.1"
 
   cluster_name    = var.cluster_name
   cluster_version = var.cluster_version
@@ -35,10 +53,21 @@ module "opsverse-eks-cluster" {
     disk_size      = 50
   }
 
+  manage_aws_auth_configmap = true
+  # Uncomment this block if you want to handle authmap/ RBAC ConfigMap from Terraform.
+  # By default, the person who created the cluster will have the access.
+  # aws_auth_users = [
+  #   {
+  #     userarn  = "arn:aws:iam::${data.aws_caller_identity.current.account_id}:user/<username>"
+  #     username = "<username>"
+  #     groups   = ["system:masters"]
+  #   },
+  # ]
+
   eks_managed_node_groups = {
     user_group_one = {
       name = "node-group-1"
-      instance_types = ["m7a.xlarge"]
+      instance_types = ["${var.node_type}"]
       ami_type       = "AL2_x86_64"
       capacity_type  = "ON_DEMAND"
       # By default, the module creates a launch template to ensure tags are propagated to instances, etc.,
@@ -48,7 +77,6 @@ module "opsverse-eks-cluster" {
       max_size     = 4
       desired_size = 3
       root_volume_type = "gp2"
-      key_name = var.keypair_name
 
       # Uncomment this if a customer already has a VPC and Subnets
       # subnets = [
diff --git a/aws/opsverse-eks-iam/provider.tf b/aws/opsverse-eks-iam/provider.tf
index 38858fe..d44ee7f 100644
--- a/aws/opsverse-eks-iam/provider.tf
+++ b/aws/opsverse-eks-iam/provider.tf
@@ -4,6 +4,10 @@ terraform {
       source  = "hashicorp/aws"
       version = "~> 5.33.0"  
     }
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = ">= 2.16.1"
+    }
   }
 
   required_version = ">= 1.3"
diff --git a/aws/opsverse-eks-iam/variables.tf b/aws/opsverse-eks-iam/variables.tf
index d31f5f9..bdbac7d 100644
--- a/aws/opsverse-eks-iam/variables.tf
+++ b/aws/opsverse-eks-iam/variables.tf
@@ -2,7 +2,7 @@
 variable "cluster_name" {}
 variable "cluster_version" {}
 variable "aws_region" {}
-variable "keypair_name" {}
+# variable "keypair_name" {}
 variable "s3_bucket_name" {}
 variable "subnet_ids" { type = list }
 variable "vpc_id" {}
@@ -11,4 +11,5 @@ variable "vpc_name" {}
 variable "vpc_cidr" {}
 variable "vpc_network_azs" { type = list }
 variable "private_subnet_cidr" { type = list }
-variable "public_subnet_cidr" { type = list }
\ No newline at end of file
+variable "public_subnet_cidr" { type = list }
+variable "node_type" { type = string }
\ No newline at end of file
diff --git a/aws/opsverse-eks-iam/vars.tfvars b/aws/opsverse-eks-iam/vars.tfvars
index f6a3331..201f913 100644
--- a/aws/opsverse-eks-iam/vars.tfvars
+++ b/aws/opsverse-eks-iam/vars.tfvars
@@ -3,12 +3,13 @@ aws_region = "us-west-2"
 cluster_name = "opsverse-eks-cluster"
 cluster_version = "1.28"
 s3_bucket_name = "opsverse-eks-bucket"
+node_type = "m5a.xlarge"
+# This is relevant if VPC and Subnets already exists and the same should be used to create ths cluster.
 subnet_ids = [
     "subnet-0cb2af484cc733af3", 
     "subnet-03e125b72f74725e0"
 ]
 vpc_id = "vpc-07f7a27bb284d892a"
-keypair_name = "bastion"
 
 # This is relevant if VPC and Subnets has to be created by the Terraform. Ignore if these are already present.
 vpc_name            = "opsverse-vpc"