diff --git a/.github/workflows/extra.yml b/.github/workflows/extra.yml
index bf438c336..c91d6fe78 100644
--- a/.github/workflows/extra.yml
+++ b/.github/workflows/extra.yml
@@ -5,14 +5,14 @@ on:
     branches:
       - main
     paths:
-      - 'environments/.stackhpc/terraform/cluster_image.auto.tfvars.json'
+      - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
       - 'ansible/roles/doca/**'
       - 'ansible/roles/cuda/**'
       - 'ansible/roles/lustre/**'
       - '.github/workflows/extra.yml'
   pull_request:
     paths:
-      - 'environments/.stackhpc/terraform/cluster_image.auto.tfvars.json'
+      - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
       - 'ansible/roles/doca/**'
       - 'ansible/roles/cuda/**'
       - 'ansible/roles/lustre/**'
@@ -30,7 +30,7 @@ jobs:
       matrix: # build RL8, RL9
         build:
           - image_name: openhpc-extra-RL8
-            source_image_name_key: RL8 # key into environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
+            source_image_name_key: RL8 # key into environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
             inventory_groups: doca,cuda,lustre
             volume_size: 30 # needed for cuda
           - image_name: openhpc-extra-RL9
@@ -51,7 +51,7 @@ jobs:
         run: |
           {
             echo 'FAT_IMAGES<<EOF'
-            cat environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
+            cat environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
             echo EOF
           } >> "$GITHUB_ENV"
 
diff --git a/.github/workflows/s3-image-sync.yml b/.github/workflows/s3-image-sync.yml
index 85e0c2fad..fefe835a2 100644
--- a/.github/workflows/s3-image-sync.yml
+++ b/.github/workflows/s3-image-sync.yml
@@ -5,10 +5,10 @@ on:
     branches:
       - main
     paths:
-      - 'environments/.stackhpc/terraform/cluster_image.auto.tfvars.json'
+      - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
 env:
   S3_BUCKET: openhpc-images-prerelease
-  IMAGE_PATH: environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
+  IMAGE_PATH: environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
 
 jobs:
   s3_cleanup:
diff --git a/.github/workflows/stackhpc.yml b/.github/workflows/stackhpc.yml
index d5bd313ca..043d61d33 100644
--- a/.github/workflows/stackhpc.yml
+++ b/.github/workflows/stackhpc.yml
@@ -84,9 +84,9 @@ jobs:
         with:
           tofu_version: 1.6.2
 
-      - name: Initialise terraform
-        run: terraform init
-        working-directory: ${{ github.workspace }}/environments/.stackhpc/terraform
+      - name: Initialise tofu
+        run: tofu init
+        working-directory: ${{ github.workspace }}/environments/.stackhpc/tofu
 
       - name: Write clouds.yaml
         run: |
@@ -94,7 +94,7 @@ jobs:
           echo "${{ secrets[format('{0}_CLOUDS_YAML', env.CI_CLOUD)] }}" > ~/.config/openstack/clouds.yaml
         shell: bash
 
-      - name: Setup environment-specific inventory/terraform inputs
+      - name: Setup environment-specific inventory/tofu inputs
         run: |
           . venv/bin/activate
           . environments/.stackhpc/activate
@@ -108,15 +108,15 @@ jobs:
         run: |
           . venv/bin/activate
           . environments/.stackhpc/activate
-          cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
-          terraform apply -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars"
+          cd $APPLIANCES_ENVIRONMENT_ROOT/tofu
+          tofu apply -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars"
 
       - name: Delete infrastructure if provisioning failed
         run: |
           . venv/bin/activate
           . environments/.stackhpc/activate
-          cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
-          terraform destroy -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars"
+          cd $APPLIANCES_ENVIRONMENT_ROOT/tofu
+          tofu destroy -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars"
         if: failure() && steps.provision_servers.outcome == 'failure'
 
       - name: Configure cluster
@@ -201,8 +201,8 @@ jobs:
         run: |
           . venv/bin/activate
           . environments/.stackhpc/activate
-          cd $APPLIANCES_ENVIRONMENT_ROOT/terraform
-          terraform destroy -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars"
+          cd $APPLIANCES_ENVIRONMENT_ROOT/tofu
+          tofu destroy -auto-approve -var-file="${{ env.CI_CLOUD }}.tfvars"
         if: ${{ success() || cancelled() }}
 
       # - name: Delete images
diff --git a/.github/workflows/trivyscan.yml b/.github/workflows/trivyscan.yml
index 5b65baca1..fe049e60d 100644
--- a/.github/workflows/trivyscan.yml
+++ b/.github/workflows/trivyscan.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - main
     paths:
-      - 'environments/.stackhpc/terraform/cluster_image.auto.tfvars.json'
+      - 'environments/.stackhpc/tofu/cluster_image.auto.tfvars.json'
 
 jobs:
   scan:
@@ -18,7 +18,7 @@ jobs:
       matrix:
         build: ["RL8", "RL9"]
     env:
-      JSON_PATH: environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
+      JSON_PATH: environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
       OS_CLOUD: openstack
       CI_CLOUD: ${{ vars.CI_CLOUD }}
 
diff --git a/environments/.stackhpc/terraform/ARCUS.tfvars b/environments/.stackhpc/tofu/ARCUS.tfvars
similarity index 100%
rename from environments/.stackhpc/terraform/ARCUS.tfvars
rename to environments/.stackhpc/tofu/ARCUS.tfvars
diff --git a/environments/.stackhpc/terraform/LEAFCLOUD.tfvars b/environments/.stackhpc/tofu/LEAFCLOUD.tfvars
similarity index 100%
rename from environments/.stackhpc/terraform/LEAFCLOUD.tfvars
rename to environments/.stackhpc/tofu/LEAFCLOUD.tfvars
diff --git a/environments/.stackhpc/terraform/SMS.tfvars b/environments/.stackhpc/tofu/SMS.tfvars
similarity index 100%
rename from environments/.stackhpc/terraform/SMS.tfvars
rename to environments/.stackhpc/tofu/SMS.tfvars
diff --git a/environments/.stackhpc/terraform/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
similarity index 100%
rename from environments/.stackhpc/terraform/cluster_image.auto.tfvars.json
rename to environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
diff --git a/environments/.stackhpc/terraform/main.tf b/environments/.stackhpc/tofu/main.tf
similarity index 97%
rename from environments/.stackhpc/terraform/main.tf
rename to environments/.stackhpc/tofu/main.tf
index 9a295e160..a08d8299f 100644
--- a/environments/.stackhpc/terraform/main.tf
+++ b/environments/.stackhpc/tofu/main.tf
@@ -60,7 +60,7 @@ data "openstack_images_image_v2" "cluster" {
 }
 
 module "cluster" {
-    source = "../../skeleton/{{cookiecutter.environment}}/terraform/"
+    source = "../../skeleton/{{cookiecutter.environment}}/tofu/"
 
     cluster_name = var.cluster_name
     cluster_net = var.cluster_net
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/compute.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/compute.tf
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/compute/main.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/compute/main.tf
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/compute/main.tf
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/compute/main.tf
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/compute/nodes.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/compute/nodes.tf
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/compute/nodes.tf
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/compute/nodes.tf
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/compute/variables.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/compute/variables.tf
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/compute/variables.tf
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/compute/variables.tf
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/inventory.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/inventory.tf
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/inventory.tf
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/inventory.tf
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/inventory.tpl b/environments/skeleton/{{cookiecutter.environment}}/tofu/inventory.tpl
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/inventory.tpl
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/inventory.tpl
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/main.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/main.tf
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/main.tf
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/main.tf
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/network.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/network.tf
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/network.tf
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/network.tf
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/nodes.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/nodes.tf
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/nodes.tf
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/nodes.tf
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/partitions.tpl b/environments/skeleton/{{cookiecutter.environment}}/tofu/partitions.tpl
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/partitions.tpl
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/partitions.tpl
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/read-inventory-secrets.py b/environments/skeleton/{{cookiecutter.environment}}/tofu/read-inventory-secrets.py
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/read-inventory-secrets.py
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/read-inventory-secrets.py
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/variables.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/variables.tf
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf
diff --git a/environments/skeleton/{{cookiecutter.environment}}/terraform/volumes.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/volumes.tf
similarity index 100%
rename from environments/skeleton/{{cookiecutter.environment}}/terraform/volumes.tf
rename to environments/skeleton/{{cookiecutter.environment}}/tofu/volumes.tf