diff --git a/image_builder/image_config.sh b/image_builder/image_config.sh
index b1304e43..eef3ba55 100755
--- a/image_builder/image_config.sh
+++ b/image_builder/image_config.sh
@@ -30,20 +30,20 @@ echo_stamp() {
 }
 
 get_image() {
-  # TEMPLATE: get_image $BUILD_DIR $RPI_DONWLOAD_URL $IMAGE_NAME
-
+  # TEMPLATE: get_image <IMAGE_PATH> <RPI_DONWLOAD_URL> 
+  local BUILD_DIR=$(dirname $1)
   local RPI_ZIP_NAME=$(basename $2)
-  if [ ! -e "$1/${RPI_ZIP_NAME}" ];
+  if [ ! -e "${BUILD_DIR}/${RPI_ZIP_NAME}" ];
   then
     echo_stamp "1. Downloading original Linux distribution"
-    wget -nv -O $1/${RPI_ZIP_NAME} $2
+    wget -nv -O ${BUILD_DIR}/${RPI_ZIP_NAME} $2
     echo_stamp "Downloading complete" "SUCCESS"
   else
     echo_stamp "1. Linux distribution already donwloaded"
   fi
   echo_stamp "2. Unzipping Linux distribution image"
   local RPI_IMAGE_NAME=$(echo ${RPI_ZIP_NAME} | sed 's/zip/img/')
-  unzip -p $1/${RPI_ZIP_NAME} ${RPI_IMAGE_NAME} > $1/$3
+  unzip -p ${BUILD_DIR}/${RPI_ZIP_NAME} ${RPI_IMAGE_NAME} > $1
   echo_stamp "Unzipping complete" "SUCCESS"
 }
 
@@ -287,8 +287,8 @@ echo "==========================================================================
 
 case "$1" in
   get_image)
-  # get_image <BUILD_DIR> <RPI_DONWLOAD_URL> <IMAGE_NAME>
-    get_image $2 $3 $4;;
+  # get_image <IMAGE_PATH> <RPI_DONWLOAD_URL>
+    get_image $2 $3;;
 
   resize_fs)
   # resize_fs <IMAGE_PATH> <SIZE>