diff --git a/app/terraform/bridge/aws.py b/app/terraform/bridge/aws.py
index 2199d65..b16d4bf 100644
--- a/app/terraform/bridge/aws.py
+++ b/app/terraform/bridge/aws.py
@@ -46,8 +46,7 @@ class BridgeAWSAutomation(BridgeAutomation):
     {% for bridge in bridgeconf.bridges %}
     {% if not bridge.destroyed %}
     module "bridge_{{ bridge.id }}" {
-      source = "sr2c/tor-bridge/aws"
-      version = "0.0.1"
+      source = "{{ terraform_modules_path }}/terraform-aws-tor-bridge"
       ssh_key = local.ssh_key
       contact_info = "hi"
       context = module.label_{{ bridgeconf.group.id }}.context
diff --git a/app/terraform/bridge/gandi.py b/app/terraform/bridge/gandi.py
index a9b9277..3992421 100644
--- a/app/terraform/bridge/gandi.py
+++ b/app/terraform/bridge/gandi.py
@@ -54,8 +54,7 @@ class BridgeGandiAutomation(BridgeAutomation):
     {% for bridge in bridgeconf.bridges %}
     {% if not bridge.destroyed %}
     module "bridge_{{ bridge.id }}" {
-      source = "sr2c/tor-bridge/openstack"
-      version = "0.0.7"
+      source = "{{ terraform_modules_path }}/terraform-openstack-tor-bridge"
       context = module.label_{{ bridgeconf.group.id }}.context
       name = "br"
       attributes = ["{{ bridge.id }}"]
diff --git a/app/terraform/bridge/hcloud.py b/app/terraform/bridge/hcloud.py
index dfe51f8..31649ba 100644
--- a/app/terraform/bridge/hcloud.py
+++ b/app/terraform/bridge/hcloud.py
@@ -64,8 +64,7 @@ class BridgeHcloudAutomation(BridgeAutomation):
     }
 
     module "bridge_{{ bridge.id }}" {
-      source = "sr2c/tor-bridge/hcloud"
-      version = "0.0.3"
+      source = "{{ terraform_modules_path }}/terraform-hcloud-tor-bridge"
       datacenter = one(random_shuffle.datacenter_{{ bridge.id }}.result)
       context = module.label_{{ bridgeconf.group.id }}.context
       name = "br"
diff --git a/app/terraform/bridge/ovh.py b/app/terraform/bridge/ovh.py
index 6cb0bb3..3fc82a0 100644
--- a/app/terraform/bridge/ovh.py
+++ b/app/terraform/bridge/ovh.py
@@ -84,8 +84,7 @@ class BridgeOvhAutomation(BridgeAutomation):
     }
 
     module "bridge_{{ bridge.id }}" {
-      source = "sr2c/tor-bridge/openstack"
-      version = "0.0.7"
+      source = "{{ terraform_modules_path }}/terraform-openstack-tor-bridge"
       region = one(random_shuffle.region_{{ bridge.id }}.result)
       context = module.label_{{ bridgeconf.group.id }}.context
       name = "br"
diff --git a/app/terraform/list/__init__.py b/app/terraform/list/__init__.py
index d3c9114..e214901 100644
--- a/app/terraform/list/__init__.py
+++ b/app/terraform/list/__init__.py
@@ -1,5 +1,6 @@
 from collections.abc import Mapping, Sequence
 import json
+import os
 from typing import List, Any
 
 from app import app