diff --git a/.gitignore b/.gitignore
index f017bb5..20bde91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -150,5 +150,4 @@ override.tf.json
 
 # End of https://www.gitignore.io/api/terraform
 
-terraform/secrets.auto.tfvars
-terraform/secrets.sh
+.env
diff --git a/scripts/terraform/terraform.sh b/scripts/terraform/terraform.sh
index d4d17b8..35e559f 100755
--- a/scripts/terraform/terraform.sh
+++ b/scripts/terraform/terraform.sh
@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
 
-set -ex
+set -e
 
 cd terraform/
 
-source secrets.sh || true
+# Load secrets from env file (if it exists)
+set -a
+source ./.env || true
+set +a -x
 
 terraform $@
diff --git a/scripts/terraform/update-secrets.sh b/scripts/terraform/update-secrets.sh
index 585b8e5..8c61960 100755
--- a/scripts/terraform/update-secrets.sh
+++ b/scripts/terraform/update-secrets.sh
@@ -4,5 +4,4 @@ set -ex
 
 cd terraform/
 
-bw get attachment secrets.sh --itemid c4f8b44e-ae62-442d-a9e0-02d0621c2454
-bw get attachment secrets.auto.tfvars --itemid c4f8b44e-ae62-442d-a9e0-02d0621c2454
+bw get attachment .env --itemid c4f8b44e-ae62-442d-a9e0-02d0621c2454