diff --git a/Dockerfile b/Dockerfile
index cc0dfcf..8da31c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,13 +11,17 @@ COPY compile-r7rs.scm .
 COPY snow/ snow/
 COPY libs/ libs/
 RUN ls -1
-RUN make && make install PREFIX=/usr/local-other
+RUN make PREFIX=/usr/local-other && make install PREFIX=/usr/local-other
 
 FROM schemers/${COMPILE_R7RS}
 RUN apt-get update && apt-get install -y \
     build-essential \
     make \
+    libfcgi-dev \
+    sqlite3 \
+    libsqlite3-dev \
     libffi8 \
+    libffi-dev \
     libgc1 \
     libssl3 \
     libuv1
diff --git a/Makefile b/Makefile
index 3fa1fc0..2d10596 100644
--- a/Makefile
+++ b/Makefile
@@ -6,15 +6,17 @@ build:
 build-docker-images:
 	for implementation in $(shell sash -L ./snow -L . compile-r7rs.scm --list-schemes); \
 		do \
+		echo "Building $${implementation}"; \
 		docker build . --build-arg COMPILE_R7RS=$${implementation} --tag=retropikzel1/compile-r7rs:$${implementation}; \
 		done
 
 #for implementation in $(shell sash -L ./snow -L . compile-r7rs.scm --list-schemes);
 
 push-docker-images:
-	for implementation in chibi chicken sagittarius; \
+	for implementation in $(shell sash -L ./snow -L . compile-r7rs.scm --list-schemes); \
 		do \
-		docker push compile-r7rs:$${implementation}; \
+		echo "Pushing $${implementation}"; \
+		docker push retropikzel1/compile-r7rs:$${implementation}; \
 		done
 
 snow: