diff --git a/roles/container/tasks/proxy.yml b/roles/container/tasks/proxy.yml
index 12c2862..dd9daa3 100644
--- a/roles/container/tasks/proxy.yml
+++ b/roles/container/tasks/proxy.yml
@@ -6,9 +6,9 @@
   vars:
     vhost_type: reverse_proxy
     vhost_id: "{{ docker_service_name }}"
-    proxy_target_protocol: "{{ docker_proxy_target_protocol }}"
+    vhost_proxy_target_protocol: "{{ docker_proxy_target_protocol }}"
     vhost_domains: "{{ docker_vhost_domains[docker_service_name] }}"
-    proxy_target_port: "{{ ports[docker_service_name][proxy_target_protocol] }}"
+    vhost_proxy_target_port: "{{ ports[docker_service_name][proxy_target_protocol] }}"
   when: reverse_proxy_type != 'traefik'
 
 - name: Set published ports variable to http port
@@ -29,7 +29,7 @@
     vhost_type: reverse_proxy
     vhost_id: "{{ docker_service_name }}_phpmyadmin"
     vhost_domains: "{{ docker_vhost_domains[docker_service_name + '_phpmyadmin'] }}"
-    proxy_target_port: "{{ ports[docker_service_name]['phpmyadmin'] }}"
+    vhost_proxy_target_port: "{{ ports[docker_service_name]['phpmyadmin'] }}"
     vhost_basicauth: "{{ docker_phpmyadmin_basicauth }}"
     vhost_basicauth_users: "{{ docker_phpmyadmin_basicauth_users }}"
   when: docker_database == 'mariadb' and ports[docker_service_name]['phpmyadmin'] is defined
diff --git a/roles/element/meta/main.yml b/roles/element/meta/main.yml
index d6d6149..56af23a 100644
--- a/roles/element/meta/main.yml
+++ b/roles/element/meta/main.yml
@@ -2,8 +2,9 @@
 
 dependencies:
   - role: docker
-  - role: uumas.general.reverse_proxy
+  - role: uumas.general.vhost
+    vhost_type: reverse_proxy
     vhost_id: element
     vhost_domains: "{{ element_domains }}"
-    proxy_target: http://127.0.0.1:{{ ports.element_http }}
+    vhost_proxy_target: http://127.0.0.1:{{ ports.element_http }}
     when: reverse_proxy_type != 'none' and reverse_proxy_type != 'traefik'
diff --git a/roles/jitsi/meta/main.yml b/roles/jitsi/meta/main.yml
index 5a3174f..035b79d 100644
--- a/roles/jitsi/meta/main.yml
+++ b/roles/jitsi/meta/main.yml
@@ -2,9 +2,10 @@
 
 dependencies:
   - role: docker
-  - role: uumas.general.reverse_proxy
+  - role: uumas.general.vhost
+    vhost_type: reverse_proxy
     vhost_id: jitsi
     vhost_domains:
       - "{{ jitsi_domain }}"
-    proxy_target: http://127.0.0.1:{{ ports.jitsi_http }}
+    vhost_proxy_target: http://127.0.0.1:{{ ports.jitsi_http }}
     when: reverse_proxy_type != 'traefik'
diff --git a/roles/service/tasks/proxy.yml b/roles/service/tasks/proxy.yml
index 0d4da1a..687a755 100644
--- a/roles/service/tasks/proxy.yml
+++ b/roles/service/tasks/proxy.yml
@@ -14,9 +14,9 @@
   vars:
     vhost_type: reverse_proxy
     vhost_id: "{{ docker_service_name }}"
-    proxy_target_protocol: "{{ docker_proxy_target_protocol }}"
+    vhost_proxy_target_protocol: "{{ docker_proxy_target_protocol }}"
     vhost_domains: "{{ docker_vhost_domains[docker_service_name] }}"
-    proxy_target_port: "{{ ports[docker_service_name][proxy_target_protocol] }}"
+    vhost_proxy_target_port: "{{ ports[docker_service_name][proxy_target_protocol] }}"
   when: reverse_proxy_type != 'traefik'
 
 - name: Set published ports variable to http port