diff --git a/modules/k8s-node-autoscaler/data.tf b/modules/k8s-node-autoscaler/data.tf
index 3f325c83..f3e213d1 100644
--- a/modules/k8s-node-autoscaler/data.tf
+++ b/modules/k8s-node-autoscaler/data.tf
@@ -41,6 +41,6 @@ data "aws_security_group" "eks_node_security_group" {
 
 data "kubernetes_storage_class" "existing" {
   metadata {
-    name = "gp2"
+    name = "gp3"
   }
 }
\ No newline at end of file
diff --git a/modules/k8s-node-autoscaler/main.tf b/modules/k8s-node-autoscaler/main.tf
index cb9d9906..73b36b0d 100644
--- a/modules/k8s-node-autoscaler/main.tf
+++ b/modules/k8s-node-autoscaler/main.tf
@@ -111,7 +111,7 @@ resource "kubernetes_storage_class" "default" {
   depends_on = [aws_eks_addon.ebs-csi-driver]
 
   metadata {
-    name = "gp2-default"
+    name = "gp3-default"
     annotations = {
       "storageclass.kubernetes.io/is-default-class" = "true"
     }
diff --git a/modules/sage-aws-eks/main.tf b/modules/sage-aws-eks/main.tf
index 2f16ed51..4394ea27 100644
--- a/modules/sage-aws-eks/main.tf
+++ b/modules/sage-aws-eks/main.tf
@@ -51,23 +51,14 @@ module "eks" {
   cluster_endpoint_public_access = true
 
   cluster_addons = {
-    # coredns = {
-    #   most_recent = true
-    # }
     kube-proxy = {
       most_recent = true
     }
     vpc-cni = {
       most_recent = true
     }
-    # TODO When the cluster is created we need to set the gp2 storageclass as default:
-    # kubectl patch storageclass gp2 -p '{"metadata": {"annotations":{"storageclass.kubernetes.io/is-default-class":"true"}}}'
-    # This way any PVC that is created will use gp2 as the default storage class
-    # aws-ebs-csi-driver = {
-    #   most_recent = true
-    # }
   }
-# TODO: The AWS EBS CSI driver is not working right for some reason. PVC are made, but storage is not being allocated. Determine why
+
   vpc_id                    = data.aws_vpc.selected.id
   subnet_ids                = data.aws_subnets.private.ids
   # TODO
@@ -114,12 +105,6 @@ module "eks" {
         }
       }
     }
-    # https://docs.aws.amazon.com/eks/latest/userguide/access-policies.html#access-policy-permissions
-    # TODO: Additional roles that need to be created:
-    # AmazonEKSAdminViewPolicy?
-    # AmazonEKSEditPolicy
-    # AmazonEKSViewPolicy
-
   }
   tags = var.tags
 }