diff --git a/Dockerfile b/Dockerfile
index 510884d740d0407b9618ca33edf95374210eebb4..a4356fc7765eaabd1e482743b2364a940e0c98a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ COPY ./conf/etc/apt/sources.list /etc/apt/sources.list
 
 RUN apt-get -q update && \
     apt-get install -y --no-install-recommends apt-utils && \
-    apt-get install -y --no-install-recommends  curl vim rsyslog && \
+    apt-get install -y --no-install-recommends  curl vim rsyslog mc && \
     apt-get install -y apache2 libapache2-mod-shib shibboleth-sp-utils shibboleth-sp-common  && \
     apt-get --yes install supervisor && \
     apt-get clean
@@ -20,5 +20,7 @@ RUN apt-get -q update && \
 COPY ./conf/etc/supervisord.conf /etc/supervisord.conf
 COPY ./conf/etc/entrypoint /etc/entrypoint
 
+EXPOSE 80
+
 ENTRYPOINT ["/etc/entrypoint"]
 
diff --git a/Makefile b/Makefile
index dfe1660806f485c346e65b953afbc85f2519b05b..6c3998a34218c0ceb7b722fcdc0dedd3ef87b7f1 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ run: # run container
 	docker run -i -t --detach --rm --env-file=$(config) --name="${FAAS_SMTP_NAME}"  ${FAAS_SHIB_IMAGE}
 
 run-nd: # run container in no-deamon mode
-	docker run -i -t --rm --env-file=$(config) --name="${FAAS_SHIB_NAME}" ${FAAS_SHIB_IMAGE}
+	docker run -i -t --rm --env-file=$(config) -p 9080:80 --name="${FAAS_SHIB_NAME}" ${FAAS_SHIB_IMAGE}
 
 up: build run # build and run container
 
diff --git a/conf/etc/entrypoint b/conf/etc/entrypoint
index 32fbeec822fd58b58f69a729618b573a54123000..e29dce196f71035713329eacfa56b704e428a36b 100755
--- a/conf/etc/entrypoint
+++ b/conf/etc/entrypoint
@@ -2,4 +2,7 @@
 
 sed -i '/imklog/s/^/#/' /etc/rsyslog.conf
 
+/usr/sbin/shib-keygen -n sp-encrypt
+/usr/sbin/shib-keygen -n sp-signing
+
 exec supervisord -c /etc/supervisord.conf