diff --git a/roles/diyidp/defaults/main.yml b/roles/diyidp/defaults/main.yml
index 5fe652520..f2e8ca303 100644
--- a/roles/diyidp/defaults/main.yml
+++ b/roles/diyidp/defaults/main.yml
@@ -14,3 +14,5 @@ diyidp_remotesp:
   - name: "{{ instance_name }} SP metadata"
     metadataurl: "https://engine.{{ base_domain }}/authentication/sp/metadata"
     acslocation: "https://engine.{{ base_domain }}/authentication/sp/consume-assertion"
+diyidp_docker_networks:
+  - name: "loadbalancer"
diff --git a/roles/diyidp/tasks/main.yml b/roles/diyidp/tasks/main.yml
index 0688ddfe7..4f16c2423 100644
--- a/roles/diyidp/tasks/main.yml
+++ b/roles/diyidp/tasks/main.yml
@@ -74,8 +74,7 @@
     pull: true
     restart_policy: "always"
     state: started
-    networks:
-      - name: "loadbalancer"
+    networks: "{{ diyidp_docker_networks }}"
     labels:
       traefik.http.routers.diyidp.rule: "Host(`{{ diyidp_domain }}`)"
       traefik.http.routers.diyidp.tls: "true"
diff --git a/roles/diyidp/templates/config-override.php.j2 b/roles/diyidp/templates/config-override.php.j2
index 7418d5bfa..41d4b3b76 100644
--- a/roles/diyidp/templates/config-override.php.j2
+++ b/roles/diyidp/templates/config-override.php.j2
@@ -2,5 +2,5 @@
 $config['certdir'] = 'config/cert/';
 $config['metadatadir'] = 'config/metadata/';
 $config['auth.adminpassword'] = '{{ diyidp.admin_password }}';
-$config['baseurlpath'] = 'https://diyidp.{{ base_domain }}/';
-$config['theme.use']   = '{{ diyidp.theme |default("default") }}';
+$config['baseurlpath'] = 'https://{{ diyidp_domain }}/';
+$config['theme.use']   = '{{ diyidp_theme |default("default") }}';
diff --git a/roles/diyidp/templates/saml20-idp-hosted.php.j2 b/roles/diyidp/templates/saml20-idp-hosted.php.j2
index 6b8577f55..c741bce77 100644
--- a/roles/diyidp/templates/saml20-idp-hosted.php.j2
+++ b/roles/diyidp/templates/saml20-idp-hosted.php.j2
@@ -5,7 +5,7 @@
  * See: https://rnd.feide.no/content/idp-hosted-metadata-reference
  */
 
-$metadata['https://diyidp.{{ base_domain}}'] = array(
+$metadata['https://{{ diyidp_domain}}'] = array(
 	/*
 	 * The hostname of the server (VHOST) that will use this SAML entity.
 	 *