diff --git a/spotify-wine/Dockerfile b/spotify-wine/Dockerfile
new file mode 100644
index 0000000..ee75693
--- /dev/null
+++ b/spotify-wine/Dockerfile
@@ -0,0 +1,17 @@
+FROM debian:jessie
+MAINTAINER Jessie Frazelle <jess@linux.com>
+
+# install wine
+# and iceweasel since we have to sign in w facebook
+# GROSS
+RUN apt-get update && apt-get install -y \
+    wine \
+    --no-install-recommends && \
+    dpkg --add-architecture i386 && \
+    apt-get update && \
+    apt-get install -y \
+    wine32
+
+COPY ./SpotifySetup.exe /usr/src/SpotifySetup.exe
+
+CMD [ "wine", "/usr/src/SpotifySetup.exe" ]
diff --git a/spotify/Dockerfile b/spotify/Dockerfile
index ee75693..813f90a 100644
--- a/spotify/Dockerfile
+++ b/spotify/Dockerfile
@@ -1,17 +1,15 @@
-FROM debian:jessie
+FROM ubuntu:14.04
 MAINTAINER Jessie Frazelle <jess@linux.com>
 
-# install wine
-# and iceweasel since we have to sign in w facebook
-# GROSS
 RUN apt-get update && apt-get install -y \
-    wine \
+    libpangoxft-1.0-0 \
+    alsa-utils \
+    software-properties-common \
     --no-install-recommends && \
-    dpkg --add-architecture i386 && \
+    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 94558F59 && \
+    echo "deb http://repository.spotify.com stable non-free" >> /etc/apt/sources.list.d/spotify.list && \
     apt-get update && \
     apt-get install -y \
-    wine32
+    spotify-client
 
-COPY ./SpotifySetup.exe /usr/src/SpotifySetup.exe
-
-CMD [ "wine", "/usr/src/SpotifySetup.exe" ]
+ENTRYPOINT  [ "/usr/bin/spotify" ]