diff --git a/root/etc/cont-init.d/30-plex-cfg b/root/etc/cont-init.d/30-plex-cfg
index 618bfe7..f1758fa 100755
--- a/root/etc/cont-init.d/30-plex-cfg
+++ b/root/etc/cont-init.d/30-plex-cfg
@@ -1,7 +1,7 @@
 #!/usr/bin/with-contenv bash
 
 # Check, if a configuration directory exists
-cp /etc/rclone.conf /root/.rclone.conf
+cp /etc/plexdrv/rclone.conf /root/.rclone.conf
 if [[ -d /config/Library ]]
 then
  echo "Configuration found, skipping restore of backup"
diff --git a/root/etc/services.d/gocryptfs/run b/root/etc/services.d/gocryptfs/run
index 9f53604..9caf7b5 100644
--- a/root/etc/services.d/gocryptfs/run
+++ b/root/etc/services.d/gocryptfs/run
@@ -8,7 +8,7 @@ done
 mkdir -pv /Video
 chmod 777 /Video
 
-s6-setuidgid plex gocryptfs -passfile /config/enc-pwd /encrypted/Video/ /Video
+s6-setuidgid plex gocryptfs -passfile /etc/plexdrv/enc-pwd /encrypted/Video/ /Video
 
 
 until false
diff --git a/root/etc/services.d/plexdrive/run b/root/etc/services.d/plexdrive/run
index a80c113..0cae55d 100755
--- a/root/etc/services.d/plexdrive/run
+++ b/root/etc/services.d/plexdrive/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-while [ ! -f "/config/config.json" ] || [ ! -f "/config/token.json" ]
+while [ ! -f "/etc/plexdrv/config.json" ] || [ ! -f "/etc/plexdrv/token.json" ]
 do
 	echo "Waiting for plexdrive configuration files ..."
 	sleep 30
@@ -10,7 +10,7 @@ umask 022
 
 IFS=" " read -r -a RUN_ARRAY <<< "$RUN_OPTS"
 
-mount_command="plexdrive mount -c /config/ --cache-file=/cache/cache.bolt -v 3 --umask=0777 --chunk-size=100M --uid=$PLEX_UID --gid=$PLEX_GID -o allow_other /encrypted ${RUN_ARRAY[@]}"
+mount_command="plexdrive mount -c /etc/plexdrv/ --cache-file=/cache/cache.bolt -v 3 --umask=0777 --chunk-size=100M --uid=$PLEX_UID --gid=$PLEX_GID -o allow_other /encrypted ${RUN_ARRAY[@]}"
 
 echo "Executing => $mount_command"
 mkdir /encrypted /decrypted