diff --git a/src/config.hpp b/src/config.hpp
index 4a5b752..364d64a 100644
--- a/src/config.hpp
+++ b/src/config.hpp
@@ -8,6 +8,5 @@ namespace dropshell {
 bool get_config_path(std::string& path);
 bool load_config();
 bool is_config_loaded();
-bool get_user_directory(std::string& path);
 
 } // namespace dropshell 
\ No newline at end of file
diff --git a/src/servers.cpp b/src/servers.cpp
index 4bd0588..21d31c2 100644
--- a/src/servers.cpp
+++ b/src/servers.cpp
@@ -1,3 +1,4 @@
+#include "init_user_directory.hpp"
 #include "dropshell.hpp"
 #include "server_env.hpp"
 #include <iostream>
diff --git a/src/templates.cpp b/src/templates.cpp
index 2d55cdd..ccf0243 100644
--- a/src/templates.cpp
+++ b/src/templates.cpp
@@ -1,3 +1,4 @@
+#include "init_user_directory.hpp"
 #include "templates.hpp"
 #include "config.hpp"
 #include <filesystem>
diff --git a/templates/squashkiwi/backup.sh b/templates/squashkiwi/_backup.sh
similarity index 100%
rename from templates/squashkiwi/backup.sh
rename to templates/squashkiwi/_backup.sh
diff --git a/templates/squashkiwi/install.sh b/templates/squashkiwi/_install.sh
similarity index 92%
rename from templates/squashkiwi/install.sh
rename to templates/squashkiwi/_install.sh
index 9841d76..3ed5962 100755
--- a/templates/squashkiwi/install.sh
+++ b/templates/squashkiwi/_install.sh
@@ -32,8 +32,9 @@ if ! docker pull "$IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG"; then
 fi
 echo "Successfully pulled the docker image from the registry"
 
-# start the container
+# remove and restart, as the env may have changed.
 _stop_container $CONTAINER_NAME
+_remove_container $CONTAINER_NAME
 create_and_start_container || die "Failed to start container ${CONTAINER_NAME}"
 
 echo "Installation complete"