diff --git a/.gitea/workflows/terraform_auto_apply.yaml b/.gitea/workflows/main.yaml
similarity index 87%
rename from .gitea/workflows/terraform_auto_apply.yaml
rename to .gitea/workflows/main.yaml
index 4e0f242..a1558de 100644
--- a/.gitea/workflows/terraform_auto_apply.yaml
+++ b/.gitea/workflows/main.yaml
@@ -2,8 +2,6 @@ name: Docker build and push
 
 on:
   push:
-    branches:
-      - "main"
 
 env:
   TOKEN: ${{ secrets.GRANT_ALL }}
@@ -19,5 +17,6 @@ jobs:
         run: |
           docker info
           docker ps
+          docker login -u gitea -p "${TOKEN}"
           cat ~/.docker/config.json
 
diff --git a/.gitea/workflows/terraform_plan.yaml b/.gitea/workflows/terraform_plan.yaml
deleted file mode 100644
index 0d8f31d..0000000
--- a/.gitea/workflows/terraform_plan.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Terraform plan
-
-on:
-  push:
-    branches-ignore:
-      - "main"
-
-env:
-  TF_HTTP_USERNAME: ${{ secrets.TF_HTTP_USERNAME }}
-  TF_HTTP_PASSWORD: ${{ secrets.TF_HTTP_PASSWORD }}
-  OVH_ENDPOINT: ${{ vars.OVH_ENDPOINT }}
-  OVH_APPLICATION_KEY: ${{ secrets.OVH_APPLICATION_KEY }}
-  OVH_APPLICATION_SECRET: ${{ secrets.OVH_APPLICATION_SECRET }}
-  OVH_CONSUMER_KEY: ${{ secrets.OVH_CONSUMER_KEY }}
-
-jobs:
-  terraform:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Download latest terraform version
-        run: |
-          TFV=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/terraform | jq -r -M '.current_version')
-          curl -JOL "https://releases.hashicorp.com/terraform/${TFV}/terraform_${TFV}_linux_amd64.zip"
-          unzip "terraform_${TFV}_linux_amd64.zip"
-          cp terraform /usr/bin/
-          chmod +x /usr/bin/terraform
-
-      - name: Terraform Init & Format
-        run: |
-          terraform init
-          terraform fmt -check -recursive
-
-      - name: Terraform Plan
-        run: terraform plan -out=tfplan