diff --git a/.github/actions/setup_environment/action.yml b/.github/actions/setup_environment/action.yml
index 62d36953..1b1b20ad 100644
--- a/.github/actions/setup_environment/action.yml
+++ b/.github/actions/setup_environment/action.yml
@@ -25,7 +25,6 @@ runs:
       if: ${{ inputs.os == 'windows-latest' }}
       run: rm.exe "C:/WINDOWS/system32/bash.EXE"
 
-
     - name: Install MLStacks
       shell: bash
       run: |
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b9e05dd..7b7314d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
     uses: ./.github/workflows/setup-python-environment.yml
     with:
@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
     uses: ./.github/workflows/setup-python-environment.yml
     with:
@@ -51,7 +51,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
     uses: ./.github/workflows/setup-python-environment.yml
     with:
@@ -64,7 +64,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
     uses: ./.github/workflows/lint-unit-test.yml
     with:
@@ -77,7 +77,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
     uses: ./.github/workflows/lint-unit-test.yml
     with:
@@ -90,7 +90,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
       fail-fast: false
     uses: ./.github/workflows/lint-unit-test.yml
     with:
diff --git a/.github/workflows/lint-unit-test.yml b/.github/workflows/lint-unit-test.yml
index 289b39cf..11e9f5a5 100644
--- a/.github/workflows/lint-unit-test.yml
+++ b/.github/workflows/lint-unit-test.yml
@@ -36,6 +36,7 @@ on:
           - '3.9'
           - '3.10'
           - '3.11'
+          - '3.12'
         required: false
         default: '3.8'
       enable_tmate:
diff --git a/aws-kubeflow-kserve/kserve-module/providers.tf b/aws-kubeflow-kserve/kserve-module/providers.tf
index 15aede9e..4b20b8ee 100644
--- a/aws-kubeflow-kserve/kserve-module/providers.tf
+++ b/aws-kubeflow-kserve/kserve-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/aws-kubeflow-kserve/mlflow-module/providers.tf b/aws-kubeflow-kserve/mlflow-module/providers.tf
index 15aede9e..4b20b8ee 100644
--- a/aws-kubeflow-kserve/mlflow-module/providers.tf
+++ b/aws-kubeflow-kserve/mlflow-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/aws-kubeflow-kserve/terraform.tf b/aws-kubeflow-kserve/terraform.tf
index ed79a893..a1557834 100644
--- a/aws-kubeflow-kserve/terraform.tf
+++ b/aws-kubeflow-kserve/terraform.tf
@@ -30,8 +30,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/aws-minimal/mlflow-module/providers.tf b/aws-minimal/mlflow-module/providers.tf
index 15aede9e..4b20b8ee 100644
--- a/aws-minimal/mlflow-module/providers.tf
+++ b/aws-minimal/mlflow-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/aws-minimal/seldon/providers.tf b/aws-minimal/seldon/providers.tf
index a7349a05..fa4c5934 100644
--- a/aws-minimal/seldon/providers.tf
+++ b/aws-minimal/seldon/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/aws-minimal/terraform.tf b/aws-minimal/terraform.tf
index ed79a893..a1557834 100644
--- a/aws-minimal/terraform.tf
+++ b/aws-minimal/terraform.tf
@@ -30,8 +30,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/aws-modular/terraform.tf b/aws-modular/terraform.tf
index 883af868..4a9f5d16 100644
--- a/aws-modular/terraform.tf
+++ b/aws-modular/terraform.tf
@@ -30,8 +30,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/azure-minimal/mlflow-module/providers.tf b/azure-minimal/mlflow-module/providers.tf
index 57c123d1..464e0f1a 100644
--- a/azure-minimal/mlflow-module/providers.tf
+++ b/azure-minimal/mlflow-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/azure-minimal/seldon/providers.tf b/azure-minimal/seldon/providers.tf
index 3f906034..8f44e3cc 100644
--- a/azure-minimal/seldon/providers.tf
+++ b/azure-minimal/seldon/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/azure-minimal/terraform.tf b/azure-minimal/terraform.tf
index bb945114..714acc89 100644
--- a/azure-minimal/terraform.tf
+++ b/azure-minimal/terraform.tf
@@ -26,8 +26,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/gcp-airflow/terraform.tf b/gcp-airflow/terraform.tf
index c0389f17..d7340050 100644
--- a/gcp-airflow/terraform.tf
+++ b/gcp-airflow/terraform.tf
@@ -25,8 +25,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
 
diff --git a/gcp-kubeflow-kserve/kserve-module/providers.tf b/gcp-kubeflow-kserve/kserve-module/providers.tf
index 15aede9e..4b20b8ee 100644
--- a/gcp-kubeflow-kserve/kserve-module/providers.tf
+++ b/gcp-kubeflow-kserve/kserve-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/gcp-kubeflow-kserve/mlflow-module/providers.tf b/gcp-kubeflow-kserve/mlflow-module/providers.tf
index 15aede9e..4b20b8ee 100644
--- a/gcp-kubeflow-kserve/mlflow-module/providers.tf
+++ b/gcp-kubeflow-kserve/mlflow-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/gcp-kubeflow-kserve/terraform.tf b/gcp-kubeflow-kserve/terraform.tf
index 84a731a2..2dbb4935 100644
--- a/gcp-kubeflow-kserve/terraform.tf
+++ b/gcp-kubeflow-kserve/terraform.tf
@@ -25,8 +25,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/gcp-minimal/mlflow-module/providers.tf b/gcp-minimal/mlflow-module/providers.tf
index 15aede9e..4b20b8ee 100644
--- a/gcp-minimal/mlflow-module/providers.tf
+++ b/gcp-minimal/mlflow-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/gcp-minimal/seldon/providers.tf b/gcp-minimal/seldon/providers.tf
index a7349a05..fa4c5934 100644
--- a/gcp-minimal/seldon/providers.tf
+++ b/gcp-minimal/seldon/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/gcp-minimal/terraform.tf b/gcp-minimal/terraform.tf
index 84a731a2..2dbb4935 100644
--- a/gcp-minimal/terraform.tf
+++ b/gcp-minimal/terraform.tf
@@ -25,8 +25,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/gcp-modular/terraform.tf b/gcp-modular/terraform.tf
index e11a60e9..42f8e49f 100644
--- a/gcp-modular/terraform.tf
+++ b/gcp-modular/terraform.tf
@@ -25,8 +25,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/gcp-vertexai/mlflow-module/providers.tf b/gcp-vertexai/mlflow-module/providers.tf
index 15aede9e..4b20b8ee 100644
--- a/gcp-vertexai/mlflow-module/providers.tf
+++ b/gcp-vertexai/mlflow-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/gcp-vertexai/terraform.tf b/gcp-vertexai/terraform.tf
index 84a731a2..2dbb4935 100644
--- a/gcp-vertexai/terraform.tf
+++ b/gcp-vertexai/terraform.tf
@@ -25,8 +25,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/k3d-modular/terraform.tf b/k3d-modular/terraform.tf
index b0b79053..3990efd5 100644
--- a/k3d-modular/terraform.tf
+++ b/k3d-modular/terraform.tf
@@ -24,8 +24,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     random = {
diff --git a/modules/cert-manager-module/providers.tf b/modules/cert-manager-module/providers.tf
index a0a1f60f..b378c773 100644
--- a/modules/cert-manager-module/providers.tf
+++ b/modules/cert-manager-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/modules/istio-module/providers.tf b/modules/istio-module/providers.tf
index a7349a05..fa4c5934 100644
--- a/modules/istio-module/providers.tf
+++ b/modules/istio-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/modules/kserve-module/providers.tf b/modules/kserve-module/providers.tf
index 545c1f40..4f824729 100644
--- a/modules/kserve-module/providers.tf
+++ b/modules/kserve-module/providers.tf
@@ -10,8 +10,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/modules/kubeflow-pipelines-module/providers.tf b/modules/kubeflow-pipelines-module/providers.tf
index 545c1f40..4f824729 100644
--- a/modules/kubeflow-pipelines-module/providers.tf
+++ b/modules/kubeflow-pipelines-module/providers.tf
@@ -10,8 +10,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/modules/minio-module/providers.tf b/modules/minio-module/providers.tf
index c90fe5db..c40db8d4 100644
--- a/modules/minio-module/providers.tf
+++ b/modules/minio-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
     minio = {
       source  = "aminueza/minio"
diff --git a/modules/mlflow-module/providers.tf b/modules/mlflow-module/providers.tf
index 15aede9e..4b20b8ee 100644
--- a/modules/mlflow-module/providers.tf
+++ b/modules/mlflow-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/modules/nginx-ingress-module/providers.tf b/modules/nginx-ingress-module/providers.tf
index f0cfc10b..8fe3d048 100644
--- a/modules/nginx-ingress-module/providers.tf
+++ b/modules/nginx-ingress-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/modules/seldon-module/providers.tf b/modules/seldon-module/providers.tf
index a7349a05..fa4c5934 100644
--- a/modules/seldon-module/providers.tf
+++ b/modules/seldon-module/providers.tf
@@ -14,8 +14,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/modules/tekton-pipelines-module/providers.tf b/modules/tekton-pipelines-module/providers.tf
index 545c1f40..4f824729 100644
--- a/modules/tekton-pipelines-module/providers.tf
+++ b/modules/tekton-pipelines-module/providers.tf
@@ -10,8 +10,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/modules/zenml-module/terraform.tf b/modules/zenml-module/terraform.tf
index 86d31ea0..d67ce1f7 100644
--- a/modules/zenml-module/terraform.tf
+++ b/modules/zenml-module/terraform.tf
@@ -26,8 +26,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/pyproject.toml b/pyproject.toml
index e8cdb442..d344538c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -25,6 +25,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: System :: Distributed Computing",
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Scientific/Engineering :: Artificial Intelligence",
@@ -63,15 +64,14 @@ exclude = [
 ]
 
 [tool.poetry.dependencies]
-# pydantic = {version = "2.0.2"}
-# compatible with Core ZenML
-python = ">=3.8,<3.12"
-pydantic = { version = "~2.7" }
+python = ">=3.8,<3.13"
+pydantic = { version = "~2.8" }
 pyyaml = { version = ">=6.0.1" }
 click = { version = "^8.0.1,<8.1.4" }
 python-terraform = { version = "^0.10.1" }
 rich = { version = "^12.0.0" }
 analytics-python = { version = "^1.4.0" }
+setuptools = "*"
 
 # dev dependencies
 ruff = { version = ">=0.1.7", optional = true }
diff --git a/scripts/format.sh b/scripts/format.sh
index ecc08a8d..9ce8271e 100644
--- a/scripts/format.sh
+++ b/scripts/format.sh
@@ -4,8 +4,8 @@ set -x
 SRC=${1:-"src/mlstacks tests scripts"}
 
 # autoflake replacement: removes unused imports and variables
-ruff $SRC --select F401,F841 --fix --exclude "__init__.py" --isolated
+ruff check $SRC --select F401,F841 --fix --exclude "__init__.py" --isolated
 
 # sorts imports
-ruff $SRC --select I --fix --ignore D
+ruff check $SRC --select I --fix --ignore D
 ruff format $SRC
diff --git a/scripts/lint.sh b/scripts/lint.sh
index 98ef5f48..3086c8ef 100644
--- a/scripts/lint.sh
+++ b/scripts/lint.sh
@@ -7,10 +7,10 @@ SRC=${1:-"src/mlstacks tests"}
 SRC_NO_TESTS=${1:-"src/mlstacks"}
 TESTS=${1:-"tests"}
 
-ruff $SRC_NO_TESTS
+ruff check $SRC_NO_TESTS
 
 # autoflake replacement: checks for unused imports and variables
-ruff $SRC --select F401,F841 --exclude "__init__.py" --isolated
+ruff check $SRC --select F401,F841 --exclude "__init__.py" --isolated
 
 ruff format $SRC  --check
 
diff --git a/src/mlstacks/terraform/aws-modular/terraform.tf b/src/mlstacks/terraform/aws-modular/terraform.tf
index e040f5f1..33f4976c 100644
--- a/src/mlstacks/terraform/aws-modular/terraform.tf
+++ b/src/mlstacks/terraform/aws-modular/terraform.tf
@@ -26,8 +26,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/src/mlstacks/terraform/gcp-modular/terraform.tf b/src/mlstacks/terraform/gcp-modular/terraform.tf
index 899c66e6..72e583fc 100644
--- a/src/mlstacks/terraform/gcp-modular/terraform.tf
+++ b/src/mlstacks/terraform/gcp-modular/terraform.tf
@@ -21,8 +21,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/src/mlstacks/terraform/k3d-modular/terraform.tf b/src/mlstacks/terraform/k3d-modular/terraform.tf
index 30bb994d..4b6cc6db 100644
--- a/src/mlstacks/terraform/k3d-modular/terraform.tf
+++ b/src/mlstacks/terraform/k3d-modular/terraform.tf
@@ -20,8 +20,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     random = {
diff --git a/src/mlstacks/terraform/modules/cert-manager-module/providers.tf b/src/mlstacks/terraform/modules/cert-manager-module/providers.tf
index 915f7c66..5a675a37 100644
--- a/src/mlstacks/terraform/modules/cert-manager-module/providers.tf
+++ b/src/mlstacks/terraform/modules/cert-manager-module/providers.tf
@@ -10,8 +10,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/src/mlstacks/terraform/modules/istio-module/providers.tf b/src/mlstacks/terraform/modules/istio-module/providers.tf
index 0013f3ff..d63e3266 100644
--- a/src/mlstacks/terraform/modules/istio-module/providers.tf
+++ b/src/mlstacks/terraform/modules/istio-module/providers.tf
@@ -10,8 +10,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/src/mlstacks/terraform/modules/kubeflow-pipelines-module/providers.tf b/src/mlstacks/terraform/modules/kubeflow-pipelines-module/providers.tf
index 8ba8fc31..56533b08 100644
--- a/src/mlstacks/terraform/modules/kubeflow-pipelines-module/providers.tf
+++ b/src/mlstacks/terraform/modules/kubeflow-pipelines-module/providers.tf
@@ -6,8 +6,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/src/mlstacks/terraform/modules/minio-module/providers.tf b/src/mlstacks/terraform/modules/minio-module/providers.tf
index b87e1643..1d18dbff 100644
--- a/src/mlstacks/terraform/modules/minio-module/providers.tf
+++ b/src/mlstacks/terraform/modules/minio-module/providers.tf
@@ -10,8 +10,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
     minio = {
       source  = "aminueza/minio"
diff --git a/src/mlstacks/terraform/modules/mlflow-module/providers.tf b/src/mlstacks/terraform/modules/mlflow-module/providers.tf
index 174c38ce..0441b9fc 100644
--- a/src/mlstacks/terraform/modules/mlflow-module/providers.tf
+++ b/src/mlstacks/terraform/modules/mlflow-module/providers.tf
@@ -10,8 +10,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/src/mlstacks/terraform/modules/nginx-ingress-module/providers.tf b/src/mlstacks/terraform/modules/nginx-ingress-module/providers.tf
index 016baee5..ed9780fa 100644
--- a/src/mlstacks/terraform/modules/nginx-ingress-module/providers.tf
+++ b/src/mlstacks/terraform/modules/nginx-ingress-module/providers.tf
@@ -10,8 +10,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/src/mlstacks/terraform/modules/seldon-module/providers.tf b/src/mlstacks/terraform/modules/seldon-module/providers.tf
index 0013f3ff..d63e3266 100644
--- a/src/mlstacks/terraform/modules/seldon-module/providers.tf
+++ b/src/mlstacks/terraform/modules/seldon-module/providers.tf
@@ -10,8 +10,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/src/mlstacks/terraform/modules/tekton-pipelines-module/providers.tf b/src/mlstacks/terraform/modules/tekton-pipelines-module/providers.tf
index 8ba8fc31..56533b08 100644
--- a/src/mlstacks/terraform/modules/tekton-pipelines-module/providers.tf
+++ b/src/mlstacks/terraform/modules/tekton-pipelines-module/providers.tf
@@ -6,8 +6,8 @@ terraform {
       version = "~> 2.11.0"
     }
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
   }
   required_version = ">= 0.14.8"
diff --git a/src/mlstacks/terraform/modules/zenml-module/terraform.tf b/src/mlstacks/terraform/modules/zenml-module/terraform.tf
index 0196e4bb..9b32d026 100644
--- a/src/mlstacks/terraform/modules/zenml-module/terraform.tf
+++ b/src/mlstacks/terraform/modules/zenml-module/terraform.tf
@@ -22,8 +22,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/src/mlstacks/terraform/remote-state-terraform-config/terraform-aws.tf b/src/mlstacks/terraform/remote-state-terraform-config/terraform-aws.tf
index f662ccbe..2995741b 100644
--- a/src/mlstacks/terraform/remote-state-terraform-config/terraform-aws.tf
+++ b/src/mlstacks/terraform/remote-state-terraform-config/terraform-aws.tf
@@ -26,8 +26,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/src/mlstacks/terraform/remote-state-terraform-config/terraform-gcp.tf b/src/mlstacks/terraform/remote-state-terraform-config/terraform-gcp.tf
index 09f69586..5f29a9fa 100644
--- a/src/mlstacks/terraform/remote-state-terraform-config/terraform-gcp.tf
+++ b/src/mlstacks/terraform/remote-state-terraform-config/terraform-gcp.tf
@@ -21,8 +21,8 @@ terraform {
     }
 
     kubectl = {
-      source  = "gavinbunney/kubectl"
-      version = "1.14.0"
+      source  = "alekc/kubectl"
+      version = "2.0.4"
     }
 
     htpasswd = {
diff --git a/src/mlstacks/utils/terraform_utils.py b/src/mlstacks/utils/terraform_utils.py
index e69376ea..38510338 100644
--- a/src/mlstacks/utils/terraform_utils.py
+++ b/src/mlstacks/utils/terraform_utils.py
@@ -250,8 +250,8 @@ def include_files(
             or filename.endswith(".md")
             or filename.endswith(".yaml")
             or filename.endswith(".sh")
-            or filename == ".terraformignore"
-            or filename == MLSTACKS_INITIALIZATION_FILE_FLAG
+            or filename
+            in {".terraformignore", MLSTACKS_INITIALIZATION_FILE_FLAG}
         )
     ]
 
@@ -1007,8 +1007,8 @@ def verify_infracost_installed() -> bool:
         bool: True if Infracost is installed, otherwise False.
     """
     try:
-        subprocess.run(
-            ["infracost", "configure", "get", "api_key"],  # noqa: S607,S603
+        subprocess.run(  # noqa: S603
+            ["infracost", "configure", "get", "api_key"],  # noqa: S607
             check=True,
             capture_output=True,
             text=True,
@@ -1079,9 +1079,9 @@ def infracost_breakdown_stack(
         infracost_cmd += f" --terraform-var {k}={v}"
 
     # Execute the command
-    process = subprocess.run(
+    process = subprocess.run(  # noqa: S602
         infracost_cmd,
-        shell=True,  # noqa: S602
+        shell=True,
         check=True,
         capture_output=True,
         text=True,