diff --git a/Dockerfile b/Dockerfile
index db3a1c1..0c18170 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,10 +25,13 @@ RUN sudo pacman --sync --refresh --noconfirm --sysupgrade \
       gnupg \
       go \
       make \
+      openssh \
       pacman-contrib \
       podman \
+      vim \
       which \
-      zip
+      zip && \
+    sudo rm --recursive --force /var/cache/pacman/pkg/*
 
 RUN sudo usermod --append --groups docker ${BUILD_USER}
 
@@ -42,6 +45,7 @@ RUN sudo pacman --sync --refresh --noconfirm --sysupgrade \
       oracle-instantclient-tools \
       rpm-builder
 
+RUN sudo mkdir /workspace && sudo chown ${BUILD_USER}:${BUILD_USER} /workspace
 WORKDIR /workspace
 VOLUME [ "/workspace" ]
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 34ec92c..7234f90 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -26,7 +26,7 @@ if [ ! -z ${SSH_KEY+x} ]; then
   sudo chmod 0700 ${HOME}/.ssh
   echo -e ${SSH_KEY} > ${HOME}/.ssh/key
   sudo chmod 0600 ${HOME}/.ssh/key
-  echo -e "Host *\n  IdentityFile ~/.ssh/key" > ${HOME}/.ssh/config
+  echo -e "Host *\n  IdentityFile ~/.ssh/key\n  StrictHostKeyChecking no\n  UserKnownHostsFile /dev/null\n" > ${HOME}/.ssh/config
 fi
 
 /bin/bash ${@}
\ No newline at end of file