diff --git a/installer/installer.sh b/installer/installer.sh
index 9ec7546..589f83e 100644
--- a/installer/installer.sh
+++ b/installer/installer.sh
@@ -31,7 +31,7 @@ add_user_ogrepository() {
 
 create_directories() {
     mkdir -p $INSTALL_DIR
-    mkdir -p $INSTALL_DIR/images $INSTALL_DIR/images_trash/  $INSTALL_DIR/bin/ $INSTALL_DIR/etc/ $INSTALL_DIR/log/ 
+    mkdir -p $INSTALL_DIR/images $INSTALL_DIR/images_trash/  $INSTALL_DIR/bin/ $INSTALL_DIR/etc/ $INSTALL_DIR/log/ $INSTALL_DIR/api/
     chown -R ogrepository:ogrepository $INSTALL_DIR
 }
 
@@ -50,18 +50,17 @@ install_external_packages() {
 }
 
 install_ogrepo-api_service() {
-    cd $DOWNLOAD_DIR
-    cp -r installer/files/ogrepo-api.service /etc/systemd/system/ogrepo-api.service
+    cp -r $DOWNLOAD_DIR/installer/files/ogrepo-api.service /etc/systemd/system/ogrepo-api.service
     systemctl enable --now ogrepo-api
     systemctl start ogrepository
 }
 
 install_files() {
-    cd $DOWNLOAD_DIR
-    install bin/* /opt/opengnsys/bin/
-    install bin/clients/* /opt/opengnsys/bin/clients 
-    install etc/* /opt/opengnsys/etc/
-    install api/* /opt/opengnsys/api   
+    install $DOWNLOAD_DIR/bin/* $INSTALL_DIR/bin/
+    install $DOWNLOAD_DIR/bin/clients/* $INSTALL_DIR/bin/clients 
+    install $DOWNLOAD_DIR/etc/* $INSTALL_DIR/etc/
+    install $DOWNLOAD_DIR/api/* $INSTALL_DIR/api   
+    chown -R ogrepository:ogrepository $INSTALL_DIR
 }
 
 ## Main program 
@@ -70,6 +69,7 @@ install_dependencies
 add_user_ogrepository
 clone_repository "$GIT_BRANCH"
 create_directories
+install_files
 install_ogrepo-api_service