diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index cbbe2e695..c8db07e97 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -15,7 +15,7 @@ RUN apt-get update
 RUN apt-get install -y openssh-server wget libstdc++6 libunwind8 libicu52
 #RUN mkdir /var/run/sshd
 RUN echo 'root:pass' | chpasswd
-RUN adduser --shell /opt/app_base/runps.sh --disabled-password --gecos "" test1
+RUN adduser --shell /opt/exec_env/app_base/runps.sh --disabled-password --gecos "" test1
 RUN echo 'test1:pass' | chpasswd
 RUN sed -i 's/PermitRootLogin without-password/PermitRootLogin yes/' /etc/ssh/sshd_config
 
@@ -28,17 +28,12 @@ RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so
 ENV NOTVISIBLE "in users profile"
 RUN echo "export VISIBLE=now" >> /etc/profile
 
-COPY exec_env/app_base/ /opt/app_base/
-RUN chmod -R ugo+rX /opt/app_base
+COPY exec_env/ /opt/exec_env/
+RUN chmod -R ugo+rX /opt/exec_env
 
-#RUN mkdir /etc/service/sshd
-#ADD sshd-init.sh /etc/service/sshd/run
 RUN mkdir /etc/service/shellinaboxd
 ADD shellinaboxd-init.sh /etc/service/shellinaboxd/run
 
 EXPOSE 22
 EXPOSE 4201
 
-# start sshd in daemonized mode, start shellinaboxd in interactive mode (must be started that way using docker's CMD)
-#CMD /usr/sbin/sshd && /usr/bin/shellinaboxd -s /:LOGIN -p 4201 -t -v
-
diff --git a/scripts/Makefile b/scripts/Makefile
index 9927b0763..ebb1ca27b 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -159,6 +159,7 @@ internal-prepare-exec_env: runps.sh $(POWERSHELL_RUN_TARGETS)
 	cp -r ../src/monad/monad/miscfiles/modules/* exec_env/app_base/Modules
 	cp -r dotnetlibs/*.dll exec_env/app_base
 	cp -r dotnetlibs/*.exe exec_env/app_base
+	cp -r dotnetlibs/*.so exec_env/app_base
 	cp dotnetlibs/host_cmdline exec_env/app_base
 	cp -r ../ext-src/pester exec_env/app_base/Modules/Pester
 	cp runps*.sh exec_env/app_base