diff --git a/roles/nginx/port_upstream/defaults/main.yml b/roles/nginx/port_upstream/defaults/main.yml
deleted file mode 100644
index 3c59e60..0000000
--- a/roles/nginx/port_upstream/defaults/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-# backend: 12345
-upstream_name: "localhost{{ backend }}"
-keep_alive: 32
diff --git a/roles/nginx/port_upstream/templates/upstream.conf b/roles/nginx/port_upstream/templates/upstream.conf
deleted file mode 100644
index b1e9354..0000000
--- a/roles/nginx/port_upstream/templates/upstream.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-upstream {{ upstream_name }} {
-	keepalive {{ keep_alive }};
-	server localhost:{{ backend }};
-}
diff --git a/roles/nginx/socket_upstream/defaults/main.yml b/roles/nginx/socket_upstream/defaults/main.yml
deleted file mode 100644
index 8b87be3..0000000
--- a/roles/nginx/socket_upstream/defaults/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-# backend: /example.socket
-upstream_name: "{{ backend | basename }}"
-keep_alive: 32
diff --git a/roles/nginx/socket_upstream/meta/main.yml b/roles/nginx/socket_upstream/meta/main.yml
deleted file mode 100644
index e2d6cfc..0000000
--- a/roles/nginx/socket_upstream/meta/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-dependencies:
-  - role: nginx/application
diff --git a/roles/nginx/socket_upstream/tasks/main.yml b/roles/nginx/socket_upstream/tasks/main.yml
deleted file mode 100644
index ce3c2e0..0000000
--- a/roles/nginx/socket_upstream/tasks/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-
-- name: Configure upstream for service on {{ backend }}
-  template:
-    src: upstream.conf
-    dest: "{{ nginx_upstreams_directory }}/{{ upstream_name }}"
-    owner: root
-    group: root
-    mode: "u=rw,g=r,o=r"
-  notify: reload nginx
diff --git a/roles/nginx/upstream/defaults/main.yml b/roles/nginx/upstream/defaults/main.yml
new file mode 100644
index 0000000..84c136d
--- /dev/null
+++ b/roles/nginx/upstream/defaults/main.yml
@@ -0,0 +1,7 @@
+---
+
+backend: "{{ (backend_port is defined) | ternary(backend_port, backend_socket) }}"
+backend_full: "{{ (backend_type == 'port') | ternary('localhost', 'unix') }}:{{ backend }}"
+backend_type: "{{ (backend_port is defined) | ternary('port', 'socket') }}"
+upstream_name: "{{ (backend_type == 'port') | ternary('localhost' + backend, backend | basename) }}"
+keep_alive: 32
diff --git a/roles/nginx/port_upstream/meta/main.yml b/roles/nginx/upstream/meta/main.yml
similarity index 67%
rename from roles/nginx/port_upstream/meta/main.yml
rename to roles/nginx/upstream/meta/main.yml
index e2d6cfc..e937443 100644
--- a/roles/nginx/port_upstream/meta/main.yml
+++ b/roles/nginx/upstream/meta/main.yml
@@ -1,4 +1,6 @@
 ---
 
+allow_duplicates: yes
+
 dependencies:
   - role: nginx/application
diff --git a/roles/nginx/port_upstream/tasks/main.yml b/roles/nginx/upstream/tasks/main.yml
similarity index 100%
rename from roles/nginx/port_upstream/tasks/main.yml
rename to roles/nginx/upstream/tasks/main.yml
diff --git a/roles/nginx/socket_upstream/templates/upstream.conf b/roles/nginx/upstream/templates/upstream.conf
similarity index 68%
rename from roles/nginx/socket_upstream/templates/upstream.conf
rename to roles/nginx/upstream/templates/upstream.conf
index 981430e..256f746 100644
--- a/roles/nginx/socket_upstream/templates/upstream.conf
+++ b/roles/nginx/upstream/templates/upstream.conf
@@ -1,4 +1,4 @@
 upstream {{ upstream_name }} {
 	keepalive {{ keep_alive }};
-	server unix:{{ backend }};
+	server {{ backend_full }};
 }