diff --git a/Dockerfile b/Dockerfile
index 800b1695e41e3f6ba650bb51242ff3fbf8f17070..a4356fc7765eaabd1e482743b2364a940e0c98a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,9 +11,16 @@ RUN echo $FAAS_SHIB_VERSION > /faas-docker-version
 COPY ./conf/etc/apt/sources.list /etc/apt/sources.list
 
 RUN apt-get -q update && \
-    apt-get install -y --no-install-recommends apt-utils curl vim rsyslog && \
-    apt-get install -y libapache2-mod-shib shibboleth-sp-utils shibboleth-sp-common  && \
+    apt-get install -y --no-install-recommends apt-utils && \
+    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
 
-#ENTRYPOINT ["/etc/entrypoint"]
+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/apt/sources.list b/conf/etc/apt/sources.list
index 972f651b859786a33b379deb06d3151ab765adcd..3d7628630d430aab0d224153aa89053b301f9a7a 100644
--- a/conf/etc/apt/sources.list
+++ b/conf/etc/apt/sources.list
@@ -1,3 +1,5 @@
+deb http://deb.debian.org/debian buster main
+deb-src http://deb.debian.org/debian buster main
 # deb http://snapshot.debian.org/archive/debian/20210111T000000Z buster main
 deb http://deb.debian.org/debian testing main
 # deb http://snapshot.debian.org/archive/debian-security/20210111T000000Z buster/updates main
diff --git a/conf/etc/entrypoint b/conf/etc/entrypoint
new file mode 100755
index 0000000000000000000000000000000000000000..e29dce196f71035713329eacfa56b704e428a36b
--- /dev/null
+++ b/conf/etc/entrypoint
@@ -0,0 +1,8 @@
+#! /bin/bash
+
+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
diff --git a/conf/etc/supervisord.conf b/conf/etc/supervisord.conf
new file mode 100644
index 0000000000000000000000000000000000000000..84faa1820080035660a497f174603aea34fee4c0
--- /dev/null
+++ b/conf/etc/supervisord.conf
@@ -0,0 +1,33 @@
+[supervisord]
+user            = root
+nodaemon        = true
+logfile         = /dev/null
+logfile_maxbytes= 0
+
+[program:rsyslog]
+command         = rsyslogd -n
+autostart       = true
+autorestart     = true
+startsecs       = 2
+stopwaitsecs    = 2
+stdout_logfile  = /dev/stdout
+stderr_logfile  = /dev/stderr
+stdout_logfile_maxbytes = 0
+stderr_logfile_maxbytes = 0
+priority        = 1
+
+[program:apache2]
+command         = /etc/init.d/apache2 start
+autostart       = true
+autorestart     = false
+directory       = /var
+startsecs       = 0
+priority        = 2
+
+[program:shibd]
+command         = /etc/init.d/shibd start
+autostart       = true
+autorestart     = false
+directory       = /var
+startsecs       = 0
+priority        = 3