diff --git a/Resources/AddMailBox.sh b/Resources/AddMailBox.sh
index b86652e..76d9bf6 100644
--- a/Resources/AddMailBox.sh
+++ b/Resources/AddMailBox.sh
@@ -3,4 +3,4 @@
 read -p "Enter name for the new sync job: " username
 adduser $username
 sed -i -e 's/UserName/'$username'/' /home/$username/.offlineimaprc
-echo "sudo -u $username offlineimap" >> /opt/mailsync.sh
+echo "sudo -u $username python3 /opt/OfflineIMAP3/offlineimap.py" >> /opt/mailsync.sh
diff --git a/install.sh b/install.sh
index 9a8bf8e..3761fcb 100644
--- a/install.sh
+++ b/install.sh
@@ -3,13 +3,25 @@
 #Goto ProjectRoot
 cd "$( dirname "$0" )"
 
-#Install required software 
-apk add dovecot php8-xml php8-fpm php8-curl php8-dom php8-iconv py3-pip sudo curl openssl
+#Intergration check
+if [ -z ${DistoBuilderINT+x} ]; then 
+    ResourceFolder=/tmp
+    #Install required software 
+    apk add dovecot php8-xml php8-fpm php8-curl php8-dom php8-iconv py3-pip sudo curl openssl
 
-#Install Nginx and Nginx Repo
-wget  https://nginx.org/keys/nginx_signing.rsa.pub -O /etc/apk/keys/nginx_signing.rsa.pub
-echo "@nginx http://nginx.org/packages/mainline/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories
-apk add nginx@nginx
+    #Install Nginx and Nginx Repo
+    wget  https://nginx.org/keys/nginx_signing.rsa.pub -O /etc/apk/keys/nginx_signing.rsa.pub
+    echo "@nginx http://nginx.org/packages/mainline/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories
+    apk add nginx@nginx
+
+    #Download ExtraResource 
+    OfflineIMAPVer=$(curl -s https://api.github.com/repos/OfflineIMAP/offlineimap3/tags | grep 'name.*' |head -n 1 | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")
+    echo "$(curl -s https://api.github.com/repos/RainLoop/rainloop-webmail/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")" > /tmp/rainloop-installed
+    echo "$OfflineIMAPVer" > /tmp/OfflineIMAP3-installed
+    curl http://www.rainloop.net/repository/webmail/rainloop-community-latest.zip -o /tmp/rlcl.zip
+    curl -L https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$OfflineIMAPVer.tar.gz -o /tmp/olim3.tar.gz
+
+fi
 
 #Configure Nginx
 rm -rf /etc/nginx/conf.d/*
@@ -29,8 +41,8 @@ mv Configs/php.conf /etc/php8/php-fpm.d/railoop.conf
 
 #Install RainLoop
 curl http://www.rainloop.net/repository/webmail/rainloop-community-latest.zip -o /tmp/rlcl.zip
-echo "$(curl -s https://api.github.com/repos/RainLoop/rainloop-webmail/releases/latest | grep 'tag_name.*' | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")" > /opt/rainloop-installed
-unzip -q /tmp/rlcl.zip -d /opt/rainloop
+unzip -q $ResourceFolder/rlcl.zip -d /opt/rainloop
+mv $ResourceFolder/rainloop-installed /opt/rainloop-installed
 
 #Configure Rainloop
 mkdir -p /opt/rainloop/data/_data_/_default_/configs /opt/rainloop/data/_data_/_default_/domains
@@ -43,10 +55,9 @@ find /opt/rainloop -type f -exec chmod 644 {} \;
 
 #Install OfflineIMAP3
 OfflineIMAPVer=$(curl -s https://api.github.com/repos/OfflineIMAP/offlineimap3/tags | grep 'name.*' |head -n 1 | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")
-echo "$OfflineIMAPVer" > /opt/OfflineIMAP3-installed
-curl -L https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$OfflineIMAPVer.tar.gz -o /tmp/olim3.tar.gz
+mv $ResourceFolder/OfflineIMAP3-installed /opt/OfflineIMAP3-installed
 mkdir /opt/OfflineIMAP3
-tar -C /opt/OfflineIMAP3 -xzf /tmp/olim3.tar.gz --strip 1 
+tar -C /opt/OfflineIMAP3 -xzf $ResourceFolder/olim3.tar.gz --strip 1 
 sed -i '/kerberos/c\' /opt/OfflineIMAP3/requirements.txt
 sed -i '/cygwin/c\' /opt/OfflineIMAP3/requirements.txt
 pip3 install -r /opt/OfflineIMAP3/requirements.txt
@@ -62,4 +73,11 @@ mv Resources/UpdateRainLoop.sh /opt/UpdateRainLoop.sh
 mv Resources/UpdateOfflineImap3.sh /opt/UpdateOfflineImap3.sh
 mv Resources/AddMailBox.sh /opt/AddMailBox.sh
 #Cleanup
-rm -f /tmp/olim3.tar.gz /tmp/rlcl.zip
\ No newline at end of file
+rm -f /tmp/olim3.tar.gz /tmp/rlcl.zip
+#Start and enable service
+rc-update add dovecot
+rc-update add nginx
+rc-update add php-fpm8
+service dovecot start
+service nginx start
+service php-fpm8 start
\ No newline at end of file