diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml
index 5bc02440..16ca1068 100644
--- a/.github/workflows/deploy_terraform.yml
+++ b/.github/workflows/deploy_terraform.yml
@@ -46,16 +46,16 @@ jobs:
       - name: Terraform Init
         run: cd infrastructure/terraform && terraform init
 
-      # - name: Terraform Workspace
-      #   run: |
-      #     BRANCH_NAME=$(echo "${{ github.ref }}" | sed -e "s/^refs\/heads\///")
-      #     cd infrastructure/terraform
-      #     terraform workspace select ${BRANCH_NAME} || terraform workspace new ${BRANCH_NAME}
+      - name: Terraform Workspace
+        run: |
+          BRANCH_NAME=$(echo "${{ github.ref }}" | sed -e "s/^refs\/heads\///")
+          cd infrastructure/terraform
+          terraform workspace select ${BRANCH_NAME} || terraform workspace new ${BRANCH_NAME}
 
       - name: Terraform Plan
         run: |
           BRANCH_NAME=$(echo "${{ github.ref }}" | sed -e "s/^refs\/heads\///")
-          cd infrastructure/terraform && terraform plan -var-file=dev.tfvars
+          cd infrastructure/terraform && terraform plan -var-file=${BRANCH_NAME}.tfvars
 
       # - name: Deploy to Dev
       #   if: github.ref == 'refs/heads/dev'