diff --git a/dev/fedora/22/base/Dockerfile b/dev/fedora/22/base/Dockerfile
index 677a018..67f4fe4 100644
--- a/dev/fedora/22/base/Dockerfile
+++ b/dev/fedora/22/base/Dockerfile
@@ -35,6 +35,10 @@ ENV LC_ALL en_US.UTF-8
 ENV LANG en_US.UTF-8
 ENV LC_CTYPE en_US.UTF-8
 
+# Golang compilers
+RUN cd /usr/local && wget https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz && \
+    tar xf go1.5.linux-amd64.tar.gz && rm go1.5.linux-amd64.tar.gz
+
 # Set up vim
 ADD setup.sh /opt/xena/setup.sh
 ADD ./vimplugins.lua /opt/xena/vimplugins.lua
@@ -46,10 +50,6 @@ RUN chmod 777 /opt/xena/setup.sh &&\
 RUN wget https://get.docker.com/builds/Linux/x86_64/docker-1.6.0 -O /usr/local/bin/docker && \
     chmod 555 /usr/local/bin/docker
 
-# Golang compilers
-RUN cd /usr/local && wget https://storage.googleapis.com/golang/go1.5.linux-amd64.tar.gz && \
-    tar xf go1.5.linux-amd64.tar.gz && rm go1.5.linux-amd64.tar.gz
-
 # Not needed?
 RUN dnf -y install dnf-plugins-core &&\
     yes | dnf copr enable xena/moonscript &&\
@@ -63,6 +63,3 @@ ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-stati
 RUN chmod +x /tini
 ENTRYPOINT ["/tini", "--"]
 ENV INITSYSTEM tini
-
-USER xena
-CMD /bin/zsh
diff --git a/dev/fedora/22/haskell/Dockerfile b/dev/fedora/22/haskell/Dockerfile
new file mode 100644
index 0000000..85a0f68
--- /dev/null
+++ b/dev/fedora/22/haskell/Dockerfile
@@ -0,0 +1,7 @@
+FROM xena/base
+
+ADD https://s3.amazonaws.com/download.fpcomplete.com/centos/7/fpco.repo /etc/yum.repos.d/fpco.repo
+RUN dnf install -y stack
+
+USER xena
+CMD /bin/zsh
diff --git a/dev/fedora/22/rust/Dockerfile b/dev/fedora/22/rust/Dockerfile
index 6ca9021..48b6793 100644
--- a/dev/fedora/22/rust/Dockerfile
+++ b/dev/fedora/22/rust/Dockerfile
@@ -1,3 +1,5 @@
-FROM xena/dotfiles:f22
+FROM xena/base
 
-RUN curl -s https://static.rust-lang.org/rustup.sh | sh
+USER root
+RUN yes | dnf copr enable alonid/rust &&\
+    dnf install -y rust