diff --git a/buildbot/google/terraform/README.md b/buildbot/google/terraform/buildbot-mlir-nvidia/README.md
rename from buildbot/google/terraform/README.md
rename to buildbot/google/terraform/buildbot-mlir-nvidia/README.md
diff --git a/buildbot/google/terraform/deployment-mlir-nvidia.yaml b/buildbot/google/terraform/buildbot-mlir-nvidia/deployment-mlir-nvidia.yaml
rename from buildbot/google/terraform/deployment-mlir-nvidia.yaml
rename to buildbot/google/terraform/buildbot-mlir-nvidia/deployment-mlir-nvidia.yaml
diff --git a/buildbot/google/terraform/main.tf b/buildbot/google/terraform/buildbot-mlir-nvidia/main.tf
rename from buildbot/google/terraform/main.tf
rename to buildbot/google/terraform/buildbot-mlir-nvidia/main.tf
diff --git a/buildbot/google/terraform/outputs.tf b/buildbot/google/terraform/buildbot-mlir-nvidia/outputs.tf
rename from buildbot/google/terraform/outputs.tf
rename to buildbot/google/terraform/buildbot-mlir-nvidia/outputs.tf
diff --git a/buildbot/google/terraform/terraform.tfvars b/buildbot/google/terraform/buildbot-mlir-nvidia/terraform.tfvars
rename from buildbot/google/terraform/terraform.tfvars
rename to buildbot/google/terraform/buildbot-mlir-nvidia/terraform.tfvars
diff --git a/buildbot/google/terraform/variables.tf b/buildbot/google/terraform/buildbot-mlir-nvidia/variables.tf
rename from buildbot/google/terraform/variables.tf
rename to buildbot/google/terraform/buildbot-mlir-nvidia/variables.tf