diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7fbebb8..80f7b34 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,3 +17,6 @@ jobs:
           go-version: '1.21.x'
       - uses: actions/checkout@v3
       - run: go build ./...
+      - uses: hashicorp/setup-terraform@v2
+      - run: terraform fmt -check -recursive
+
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index 764f350..89f3966 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -37,13 +37,8 @@ jobs:
       with:
         project_id: kontaindotme
 
-    - name: Terraform Plan
+    - name: Terraform Plan and Apply
       run: |
         terraform init
         terraform plan -input=false -lock=false -out=plan.tmp
-
-    - name: Terraform Apply
-      run: terraform apply -auto-approve -input=false plan.tmp
-
-    - run: ./test.sh
-
+        terraform apply -auto-approve -input=false plan.tmp