diff --git a/releases/rebuild-release.sh b/releases/rebuild-release.sh
index 9000334b2..ce3d445d0 100755
--- a/releases/rebuild-release.sh
+++ b/releases/rebuild-release.sh
@@ -5,11 +5,14 @@
 		rm -rf packages
 		mkdir -p ~/repos/wekan/packages
 		cd ~/repos/wekan/packages
-		git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
-		git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
-		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
-		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
-		git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+                git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+                git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+                git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
+                git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+                git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+                git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git
+                mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc
+                mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc
 
 		if [[ "$OSTYPE" == "darwin"* ]]; then
 			echo "sed at macOS";
diff --git a/releases/rebuild-wekan.sh b/releases/rebuild-wekan.sh
new file mode 100755
index 000000000..ed439696b
--- /dev/null
+++ b/releases/rebuild-wekan.sh
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+echo "Note: If you use other locale than en_US.UTF-8 , you need to additionally install en_US.UTF-8"
+echo "      with 'sudo dpkg-reconfigure locales' , so that MongoDB works correctly."
+echo "      You can still use any other locale as your main locale."
+
+X64NODE="https://releases.wekan.team/node-v8.11.3-linux-x64.tar.gz"
+
+function pause(){
+	read -p "$*"
+}
+
+echo
+PS3='Please enter your choice: '
+options=("Install Wekan dependencies" "Build Wekan" "Quit")
+select opt in "${options[@]}"
+do
+    case $opt in
+        "Install Wekan dependencies")
+
+		if [[ "$OSTYPE" == "linux-gnu" ]]; then
+	                echo "Linux";
+
+			if [ "$(grep -Ei 'buntu|mint' /etc/*release)" ]; then
+				sudo apt install -y build-essential git curl wget
+#				sudo apt -y install nodejs npm
+#				sudo npm -g install n
+#				sudo n 8.11.3
+			fi
+
+#			if [ "$(grep -Ei 'debian' /etc/*release)" ]; then
+#				sudo apt install -y build-essential git curl wget
+#				echo "Debian, or Debian on Windows Subsystem for Linux"
+#				curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
+#				sudo apt install -y nodejs
+#			fi
+
+			# TODO: Add Sandstorm for version of Node.js install
+			#MACHINE_TYPE=`uname -m`
+			#if [ ${MACHINE_TYPE} == 'x86_64' ]; then
+			#	# 64-bit stuff here
+			#	wget ${X64NODE}
+			#	sudo tar -C /usr/local --strip-components 1 -xzf ${X64NODE}
+			#elif [ ${MACHINE_TYPE} == '32bit' ]; then
+			#	echo "TODO: 32-bit Linux install here"
+			#	exit
+			#fi
+		elif [[ "$OSTYPE" == "darwin"* ]]; then
+		        echo "macOS";
+			pause '1) Install XCode 2) Install Node 8.x from https://nodejs.org/en/ 3) Press [Enter] key to continue.'
+		elif [[ "$OSTYPE" == "cygwin" ]]; then
+		        # POSIX compatibility layer and Linux environment emulation for Windows
+		        echo "TODO: Add Cygwin";
+			exit;
+		elif [[ "$OSTYPE" == "msys" ]]; then
+		        # Lightweight shell and GNU utilities compiled for Windows (part of MinGW)
+		        echo "TODO: Add msys on Windows";
+			exit;
+		elif [[ "$OSTYPE" == "win32" ]]; then
+		        # I'm not sure this can happen.
+		        echo "TODO: Add Windows";
+			exit;
+		elif [[ "$OSTYPE" == "freebsd"* ]]; then
+		        echo "TODO: Add FreeBSD";
+			exit;
+		else
+		        echo "Unknown"
+			echo ${OSTYPE}
+			exit;
+		fi
+
+	        ## Latest npm with Meteor 1.6
+	        sudo npm -g install npm
+	        sudo npm -g install node-gyp
+	        # Latest fibers for Meteor 1.6
+	        sudo npm -g install fibers@2.0.0
+	        # Install Meteor, if it's not yet installed
+	        curl https://install.meteor.com | bash
+#	        mkdir ~/repos
+#	        cd ~/repos
+#	        git clone https://github.com/wekan/wekan.git
+#	        cd wekan
+#	        git checkout devel
+		break
+		;;
+        "Build Wekan")
+		echo "Building Wekan."
+		cd ~/repos/wekan
+		rm -rf packages
+		mkdir -p ~/repos/wekan/packages
+		cd ~/repos/wekan/packages
+		git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router
+		git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core
+		git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git
+		git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git
+		git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git
+		if [[ "$OSTYPE" == "darwin"* ]]; then
+			echo "sed at macOS";
+			sed -i '' 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+		else
+			echo "sed at ${OSTYPE}"
+			sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' ~/repos/wekan/packages/meteor-useraccounts-core/package.js
+		fi
+
+		cd ~/repos/wekan
+		rm -rf node_modules
+		meteor npm install
+		rm -rf .build
+		meteor build .build --directory
+		cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
+		#Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
+		#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
+		#https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
+		#cd ~/repos/wekan/.build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
+		#rm -rf node_modules/bcrypt
+		#meteor npm install bcrypt
+		cd ~/repos/wekan/.build/bundle/programs/server
+		rm -rf node_modules
+		meteor npm install
+		#meteor npm install bcrypt
+		cd ~/repos
+		echo Done.
+		break
+		;;
+        "Quit")
+		break
+            ;;
+        *) echo invalid option;;
+    esac
+done
diff --git a/releases/release-sandstorm.sh b/releases/release-sandstorm.sh
index e696eab44..89dfc4fca 100755
--- a/releases/release-sandstorm.sh
+++ b/releases/release-sandstorm.sh
@@ -12,7 +12,8 @@ cd ~/repos
 cd ~/repos/wekan
 meteor-spk pack wekan-$1.spk
 spk publish wekan-$1.spk
-scp wekan-$1.spk x2:/var/snap/wekan/common/releases.wekan.team/
+#scp wekan-$1.spk x2:/var/snap/wekan/common/releases.wekan.team/
+scp wekan-$1.spk x2:/var/www/releases.wekan.team/
 mv wekan-$1.spk ..
 
 # Delete old stuff
diff --git a/releases/release-snap.sh b/releases/release-snap.sh
index 127334c38..6ef37bffa 100755
--- a/releases/release-snap.sh
+++ b/releases/release-snap.sh
@@ -22,5 +22,6 @@ cd ~/repos/wekan
 sudo snap install --dangerous wekan_$1_amd64.snap
 echo "Now you can test local installed snap."
 snapcraft push wekan_$1_amd64.snap
-scp wekan_$1_amd64.snap x2:/var/snap/wekan/common/releases.wekan.team/
+#scp wekan_$1_amd64.snap x2:/var/snap/wekan/common/releases.wekan.team/
+scp wekan_$1_amd64.snap x2:/var/www/releases.wekan.team/
 mv wekan_$1_amd64.snap ..
diff --git a/releases/release.sh b/releases/release.sh
index 85c60b179..3206b7f18 100755
--- a/releases/release.sh
+++ b/releases/release.sh
@@ -1,9 +1,7 @@
 # Usage: ./release.sh 1.36
 
 # Build Sandstorm
-cd ~/repos/wekan
-./releases/release-sandstorm.sh $1
+./release-sandstorm.sh $1
 
 # Build Snap
-cd ~/repos/wekan
-./releases/release-snap.sh $1
+./release-snap.sh $1