diff --git a/.github/workflows/reusable_data_model_gen.yml b/.github/workflows/reusable_data_model_gen.yml
index 15cae4ef4..6fb6c5647 100644
--- a/.github/workflows/reusable_data_model_gen.yml
+++ b/.github/workflows/reusable_data_model_gen.yml
@@ -10,7 +10,7 @@ jobs:
     outputs:
       user: ${{ steps.data.outputs.user }}
       pass: ${{ steps.data.outputs.pass }}
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     timeout-minutes: 1
     steps:
       - name: Generate random username and password
@@ -24,7 +24,7 @@ jobs:
 
   schemaspy:
     name: Generate Documentation
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     needs: [vars]
     services:
       postgres:
@@ -87,4 +87,4 @@ jobs:
       - name: Deploy to Pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:
-          folder: output
\ No newline at end of file
+          folder: output
diff --git a/.github/workflows/reusable_terraform_frontend.yml b/.github/workflows/reusable_terraform_frontend.yml
index 7420427bb..cbd274eb2 100644
--- a/.github/workflows/reusable_terraform_frontend.yml
+++ b/.github/workflows/reusable_terraform_frontend.yml
@@ -33,6 +33,9 @@ jobs:
             - name: Checkout
               uses: actions/checkout@v4
 
+            - name: HashiCorp - Setup Terraform
+              uses: hashicorp/setup-terraform@v3.1.2
+
             - name: Build Frontend
               working-directory: frontend
               run: |
diff --git a/.github/workflows/reusable_terraform_server.yml b/.github/workflows/reusable_terraform_server.yml
index 8d21f3aac..8bef9f43a 100644
--- a/.github/workflows/reusable_terraform_server.yml
+++ b/.github/workflows/reusable_terraform_server.yml
@@ -181,11 +181,15 @@ jobs:
                   fam_update_user_info_api_key = "${{ secrets.fam_update_user_info_api_key }}"
                   EOF
 
+            - name: HashiCorp - Setup Terraform
+              uses: hashicorp/setup-terraform@v3.1.2
+
             - name: Terragrunt ${{ inputs.tf_subcommand }}
               working-directory: ${{ env.TG_SRC_PATH }}/${{ inputs.environment_name }}
               env:
                   licenceplate: ${{ secrets.licenceplate }}
                   target_env: ${{ inputs.environment_name }}
+
               run: |
                   # Run terraform
                   terragrunt run-all ${{ inputs.tf_subcommand }} --terragrunt-non-interactive