diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index b0fb912..b052494 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -4,6 +4,9 @@ on:
   push:
     branches:
       - main
+      - feature/test-filters
+    tags:
+      - v\d+\.\d+\.\d+$
   pull_request:
 
 jobs:
@@ -36,7 +39,7 @@ jobs:
       - name: Terraform Plan
         id: plan
         if: github.event_name == 'pull_request'
-        run: terraform plan -no-color
+        run: terraform plan -var db_pass=${{secrets.DB_PASS }} -no-color
         continue-on-error: true
 
       - uses: actions/github-script@0.9.0
@@ -70,6 +73,20 @@ jobs:
         if: steps.plan.outcome == 'failure'
         run: exit 1
 
-      # - name: Terraform Apply
-      #   if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-      #   run: terraform apply -auto-approve
\ No newline at end of file
+      - name: Check tag
+        id: check-tag
+        run: |
+          if [[ ${{ github.ref }} =~ "^refs\/tags\/v[0-9]+\.[0-9]+\.[0-9]+$" ]]; then echo ::set-output name=environment::production
+          elif [[ ${{ github.ref }} == 'refs/heads/feature/test-filters' ]]; then echo ::set-output name=environment::staging
+          else echo ::set-output name=environment::unknown
+          fi
+
+      - name: Terraform Apply Staging
+        if: steps.check-tag.outputs.environment == 'production' && github.event_name == 'push'
+        working-directory: 07-managing-multiple-environments/file-structure/staging
+        run: terraform apply -var db_pass=${{secrets.DB_PASS }} -auto-approve
+
+      - name: Terraform Apply Production
+        if: steps.check-tag.outputs.environment == 'staging' && github.event_name == 'push'
+        working-directory: 07-managing-multiple-environments/file-structure/production
+        run: terraform apply -var db_pass=${{secrets.DB_PASS }} -auto-approve