diff --git a/.gitignore b/.gitignore
index f97c17773..a366b4925 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ yarn.lock
 .installed
 package-lock.json
 dist
+.temp
+
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 79f985b65..3ba632d49 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -5,10 +5,10 @@ FROM gitpod/workspace-full:latest
 USER root
 RUN apt-get update && apt-get install -y mc rsync 
 
-ADD gitpod/install.sh /tmp/install.sh
+ADD gitpod/install_docker.sh /tmp/install_docker.sh
 ADD gitpod/package.json /tmp/package.json
 
-RUN bash /tmp/install.sh
+RUN bash /tmp/install_docker.sh
 
 
 # RUN apt-get clean && rm -rf /var/cache/apt/* && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/*
diff --git a/.gitpod.yml b/.gitpod.yml
index c248f5027..c17335952 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -2,7 +2,8 @@ image:
   file: .gitpod.Dockerfile
 # # Commands to start on workspace startup
 tasks:
-    - command: run.sh
+    - init: bash /workspace/www_threefold_io/gitpod/install.sh
+    - command: bash /workspace/www_threefold_io/gitpod/run.sh
 ports:
   - port: 8080
     onOpen: open-browser
diff --git a/gitpod/install.sh b/gitpod/install.sh
index e8c1f3c64..e4c831230 100644
--- a/gitpod/install.sh
+++ b/gitpod/install.sh
@@ -1,24 +1,20 @@
-set -ex
-sudo chown gitpod:gitpod -R /tmp
+set -e
+
 
 export base=/nodejs
-export lts=14.17.3
 
-echo $base
-sudo mkdir -p $base
-sudo chown gitpod:gitpod -R $base
+export PATH=$base/bin:$PATH
+
+source $base/nvm.sh
+
 cd $base
 
-rm -f $base/nvm.sh
-curl -s -o nvm.sh https://raw.githubusercontent.com/nvm-sh/nvm/master/nvm.sh
-bash nvm.sh
+rm -f yarn.lock
+rm -rf .cache		
 
-export NVM_DIR=$base
-source $base/nvm.sh
 nvm install --lts
 nvm use --lts
 
-cp /tmp/package.json .
+cd /workspace
+git clone https://github.com/threefoldfoundation/data_threefold
 
-npm install --global @gridsome/cli
-npm install
diff --git a/gitpod/install_docker.sh b/gitpod/install_docker.sh
new file mode 100644
index 000000000..46b59f767
--- /dev/null
+++ b/gitpod/install_docker.sh
@@ -0,0 +1,25 @@
+set -ex
+sudo chown gitpod:gitpod -R /tmp
+
+export base=/nodejs
+export lts=14.17.3
+
+echo $base
+sudo mkdir -p $base
+sudo chown gitpod:gitpod -R $base
+cd $base
+
+rm -f $base/nvm.sh
+curl -s -o nvm.sh https://raw.githubusercontent.com/nvm-sh/nvm/master/nvm.sh
+bash nvm.sh
+
+export NVM_DIR=$base
+source $base/nvm.sh
+
+nvm install --lts
+nvm use --lts
+
+cp /tmp/package.json .
+
+npm install --global @gridsome/cli
+npm install
diff --git a/gitpod/run.sh b/gitpod/run.sh
new file mode 100644
index 000000000..42800a6ed
--- /dev/null
+++ b/gitpod/run.sh
@@ -0,0 +1,29 @@
+set -e
+
+
+export base=/nodejs
+
+export PATH=$base/bin:$PATH
+
+source $base/nvm.sh
+
+nvm install --lts
+nvm use --lts
+
+#go to the website
+cd ..
+
+rm -f yarn.lock
+rm -rf .cache
+
+#copy from the docker image to speedup
+rsync -rav --delete $base/node_modules/ node_modules/ 
+
+#make sure all modules are there
+npm install
+
+if [ -f vue.config.js ]; then
+npm run-script serve
+else
+gridsome develop
+fi
\ No newline at end of file
diff --git a/run.sh b/run.sh
deleted file mode 100644
index dc7aced36..000000000
--- a/run.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-set -ex
-
-rm -f yarn.lock
-rm -rf .cache		
-
-
-export base=/nodejs
-
-source $base/nvm.sh
-nvm use --lts
-
-rsync -ra --delete $base/node_modules/ node_modules/ 
-
-npm install
-
-export PATH=$base/bin:\$PATH
-
-if [ -f vue.config.js ]; then
-npm run-script serve
-else
-gridsome develop
-fi
\ No newline at end of file