diff --git a/pillars/roles/lxc/video.sls b/pillars/roles/lxc/video.sls
index 5ebe0de..9b02631 100644
--- a/pillars/roles/lxc/video.sls
+++ b/pillars/roles/lxc/video.sls
@@ -11,9 +11,9 @@ lxc:
   lidarr:
     bind_dirs:
       - mnt/video
-  emby:
-    bind_dirs:
-      - mnt/video
-      - mnt/emby
+#  emby:
+#    bind_dirs:
+#      - mnt/video
+#      - mnt/emby
   ombi: []
-  jackett: []
\ No newline at end of file
+  jackett: []
diff --git a/pillars/roles/mount/emby.sls b/pillars/roles/mount/emby.sls
new file mode 100644
index 0000000..173ea7b
--- /dev/null
+++ b/pillars/roles/mount/emby.sls
@@ -0,0 +1,10 @@
+mount:
+  sshfs:
+    /mnt/video:
+      name: video
+      host: host.actcur.com
+      directory: /mnt/butter/video
+      user: mount
+  ext4:
+    /mnt/emby:
+      device: UUID=e1e56368-5771-4b6c-a70c-ce23dde1681c
diff --git a/pillars/roles/mount/video.sls b/pillars/roles/mount/video.sls
index e21ccce..dc41109 100644
--- a/pillars/roles/mount/video.sls
+++ b/pillars/roles/mount/video.sls
@@ -6,7 +6,5 @@ mount:
       directory: /mnt/butter/video
       user: mount
   ext4:
-    /mnt/emby:
-      device: UUID=e1e56368-5771-4b6c-a70c-ce23dde1681c
     /mnt/lxc:
       device: UUID=a11c4225-bf55-4888-ab15-589afde95510
diff --git a/pillars/roles/nginx/emby.sls b/pillars/roles/nginx/emby.sls
new file mode 100644
index 0000000..9ec3c4f
--- /dev/null
+++ b/pillars/roles/nginx/emby.sls
@@ -0,0 +1,13 @@
+nginx:
+  emby:
+    auth: none
+    https:
+      port: 8096
+      prot: http
+
+portal:
+  Media:
+    emby:
+      name: Emby
+      summary: Emby Media Server
+      public: true
diff --git a/pillars/roles/nginx/video.sls b/pillars/roles/nginx/video.sls
index fee59b3..c034863 100644
--- a/pillars/roles/nginx/video.sls
+++ b/pillars/roles/nginx/video.sls
@@ -1,9 +1,4 @@
 nginx:
-  emby:
-    auth: none
-    https:
-      port: 8096
-      prot: http
   ombi:
     auth: none
     default: no
@@ -37,10 +32,6 @@ nginx:
 
 portal:
   Media:
-    emby:
-      name: Emby
-      summary: Emby Media Server
-      public: true
     ombi:
       name: TV/Movie Requests
       summary: OMBI Plex Requests Server
@@ -60,4 +51,4 @@ portal:
     jackett:
       name: Torrent Indexers
       summary: Jackett Server
-      public: false
\ No newline at end of file
+      public: false
diff --git a/pillars/servers/roles/server/emby.sls b/pillars/servers/roles/server/emby.sls
index 8daa98a..8f39d8d 100644
--- a/pillars/servers/roles/server/emby.sls
+++ b/pillars/servers/roles/server/emby.sls
@@ -3,5 +3,5 @@ grains:
     - server
     - nrpe
     - saltminion
-    - lxc_container
+    - nginx-proxy
     - emby