diff --git a/.github/workflows/docker-admin.yaml b/.github/workflows/docker-admin.yaml
index 7be8e6fe..6f55b058 100644
--- a/.github/workflows/docker-admin.yaml
+++ b/.github/workflows/docker-admin.yaml
@@ -10,7 +10,7 @@ on:
     branches: ['**']
 
 jobs:
-  docker:
+  docker-admin:
     runs-on: ubuntu-latest
     outputs:
       img_tag: ${{ steps.preserve_img_tag.outputs.img_tag }}
@@ -47,7 +47,7 @@ jobs:
     concurrency:
       group: prs-to-afn-k8s
       cancel-in-progress: false
-    needs: docker
+    needs: docker-admin
     if: github.ref == 'refs/heads/master'
     runs-on: ubuntu-latest
     steps:
@@ -61,7 +61,7 @@ jobs:
 
       - name: PR tag change to afn-k8s
         env:
-          IMG_TAG: ${{needs.docker.outputs.img_tag}}
+          IMG_TAG: ${{needs.docker-admin.outputs.img_tag}}
           GH_TOKEN: ${{ secrets.GHA_REPO_TOKEN }}
           CHANGE_TYPE: admin
         run: |
diff --git a/.github/workflows/docker-api.yml b/.github/workflows/docker-api.yml
index a2d72737..bd3eaee8 100644
--- a/.github/workflows/docker-api.yml
+++ b/.github/workflows/docker-api.yml
@@ -10,7 +10,7 @@ on:
     branches: ['**']
 
 jobs:
-  docker:
+  docker-api:
     runs-on: ubuntu-latest
     outputs:
       img_tag: ${{ steps.preserve_img_tag.outputs.img_tag }}
@@ -39,7 +39,7 @@ jobs:
           extra_args: --push-retry 5
 
   deploy:
-    needs: docker
+    needs: docker-api
     if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/production'
     runs-on: ubuntu-latest
     steps:
@@ -74,7 +74,7 @@ jobs:
             ${{ secrets.AFN_MANAGER_DEPLOY_API_SCRIPT }} ghcr.io/julsemaan/anyfile-notepad/api:${{ steps.deploy-env.outputs.TARGET_IMAGE }} ${{ steps.deploy-env.outputs.TARGET_SERVERS }}
 
   pr_afn_k8s:
-    needs: docker
+    needs: docker-api
     concurrency:
       group: prs-to-afn-k8s
       cancel-in-progress: false
@@ -91,7 +91,7 @@ jobs:
 
       - name: PR tag change to afn-k8s
         env:
-          IMG_TAG: ${{needs.docker.outputs.img_tag}}
+          IMG_TAG: ${{needs.docker-api.outputs.img_tag}}
           GH_TOKEN: ${{ secrets.GHA_REPO_TOKEN }}
         run: |
           BRANCH_ID=`date "+%Y%m%d"`
diff --git a/.github/workflows/docker-client-base.yml b/.github/workflows/docker-client-base.yml
index ed351273..f98a2cfe 100644
--- a/.github/workflows/docker-client-base.yml
+++ b/.github/workflows/docker-client-base.yml
@@ -10,7 +10,7 @@ on:
     branches: ['**']
 
 jobs:
-  docker:
+  docker-client-base:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/docker-client.yml b/.github/workflows/docker-client.yml
index 788b3b86..674f1cb3 100644
--- a/.github/workflows/docker-client.yml
+++ b/.github/workflows/docker-client.yml
@@ -1,6 +1,8 @@
 name: Docker Image client
 
 on:
+  pull_request:
+    branches: ["main"]
   push:
     branches: ['**']
     paths: 
@@ -11,7 +13,7 @@ on:
     branches: ['**']
 
 jobs:
-  docker:
+  docker-client:
     runs-on: ubuntu-latest
     outputs:
       img_tag: ${{ steps.preserve_img_tag.outputs.img_tag }}
@@ -63,11 +65,11 @@ jobs:
             --build-arg=SRC_IMAGE=ghcr.io/julsemaan/anyfile-notepad/client-full:${{ env.IMG_TAG }}
 
   pr_afn_k8s:
-    needs: docker
+    needs: docker-client
     concurrency:
       group: prs-to-afn-k8s
       cancel-in-progress: false
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/beta'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -81,7 +83,7 @@ jobs:
       - name: PR tag change to afn-k8s
         if: github.ref != 'refs/heads/beta'
         env:
-          IMG_TAG: ${{needs.docker.outputs.img_tag}}
+          IMG_TAG: ${{needs.docker-client.outputs.img_tag}}
           GH_TOKEN: ${{ secrets.GHA_REPO_TOKEN }}
           CHANGE_TYPE: appProdImage
         run: |
@@ -105,7 +107,7 @@ jobs:
       - name: PR tag change to afn-k8s
         if: github.ref == 'refs/heads/beta'
         env:
-          IMG_TAG: ${{needs.docker.outputs.img_tag}}
+          IMG_TAG: ${{needs.docker-client.outputs.img_tag}}
           GH_TOKEN: ${{ secrets.GHA_REPO_TOKEN }}
           CHANGE_TYPE: appDevImage
         run: |
@@ -113,7 +115,8 @@ jobs:
           BRANCH_NAME=tmp/$BRANCH_ID
 
           # The branch already exists from the previous step
-          git checkout $BRANCH_NAME
+          git checkout $BRANCH_NAME || true
+          git checkout -b $BRANCH_NAME
 
           yq -i '.backend.'$CHANGE_TYPE'.tag = "'$IMG_TAG'"' charts/afn/values.yaml
 
diff --git a/.github/workflows/docker-pages.yaml b/.github/workflows/docker-pages.yaml
index 2f62b4ce..513efeb9 100644
--- a/.github/workflows/docker-pages.yaml
+++ b/.github/workflows/docker-pages.yaml
@@ -10,7 +10,7 @@ on:
     branches: ['**']
 
 jobs:
-  docker:
+  docker-pages:
     runs-on: ubuntu-latest
     outputs:
       img_tag: ${{ steps.preserve_img_tag.outputs.img_tag }}
@@ -39,7 +39,7 @@ jobs:
             --push-retry 5
       
   pr_afn_k8s:
-    needs: docker
+    needs: docker-pages
     concurrency:
       group: prs-to-afn-k8s
       cancel-in-progress: false
@@ -56,7 +56,7 @@ jobs:
 
       - name: PR tag change to afn-k8s
         env:
-          IMG_TAG: ${{needs.docker.outputs.img_tag}}
+          IMG_TAG: ${{needs.docker-pages.outputs.img_tag}}
           GH_TOKEN: ${{ secrets.GHA_REPO_TOKEN }}
           CHANGE_TYPE: pages
         run: |
diff --git a/.github/workflows/docker-webserver.yml b/.github/workflows/docker-webserver.yml
index a75254c1..3a0b7fcc 100644
--- a/.github/workflows/docker-webserver.yml
+++ b/.github/workflows/docker-webserver.yml
@@ -10,7 +10,7 @@ on:
     branches: ['**']
 
 jobs:
-  docker:
+  docker-webserver:
     runs-on: ubuntu-latest
     outputs:
       img_tag: ${{ steps.preserve_img_tag.outputs.img_tag }}
@@ -39,7 +39,7 @@ jobs:
           extra_args: --push-retry 5
 
   pr_afn_k8s:
-    needs: docker
+    needs: docker-webserver
     concurrency:
       group: prs-to-afn-k8s
       cancel-in-progress: false
@@ -56,7 +56,7 @@ jobs:
 
       - name: PR tag change to afn-k8s
         env:
-          IMG_TAG: ${{needs.docker.outputs.img_tag}}
+          IMG_TAG: ${{needs.docker-webserver.outputs.img_tag}}
           GH_TOKEN: ${{ secrets.GHA_REPO_TOKEN }}
         run: |
           BRANCH_ID=`date "+%Y%m%d"`
diff --git a/.vimrc b/.vimrc
new file mode 100644
index 00000000..f26996c9
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1 @@
+set wildignore+=*/bower_components
diff --git a/TODO.txt b/TODO.txt
index e63418d4..a531d747 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -3,7 +3,8 @@ X Debounce SUBMIT on contact form
 X Create sliding pane with adflare ad instead of infolinks
 X Have branch + GHA flow for BETA JS app
 X afn-app.sh needs exit on fail, pipe fail, etc
-- Prevent Authorize prompt from always coming up
+X Prevent Authorize prompt from always coming up
+- Reimplement authorize prompt and switch user prompt to let users know what's up before the redirect
 - Implement stats monitoring via API with Prometheus
 - Implement dark mode in menus and for the header
 - Use JWT instead of session ID for afn-pp session (no need to sync sessions after)
diff --git a/client/_major_notice_modal.html b/client/_major_notice_modal.html
index 1eac9eec..f03e35aa 100644
--- a/client/_major_notice_modal.html
+++ b/client/_major_notice_modal.html
@@ -1,3 +1,10 @@
+<script>
+function newGoogleAuthBetaTry() {
+  application.controllers.editor.major_notice_pref.refreshAndSet(parseInt($('#major_notice_modal').attr('data-version')), application.controllers.editor, application.controllers.editor.show_reauth)
+  application.try_dev_mode();
+}
+</script>
+        
 <script class="template-partial" data-partial-name="major_notice_modal" type="text/x-handlebars">
 <div class="modal fade" id="major_notice_modal" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="false" data-version="8">
   <div class="modal-dialog">
@@ -6,8 +13,8 @@
         <h4>New BETA version available for early adoption</h4>
 
         <p>The new version includes a major improvement around Google Authentication to prevent the frequent "Authorize" prompts.</p>
-        
-        <a href='javascript:void(0)' onclick='javascript:application.try_dev_mode()'>Click here to try out the BETA version!</a>
+
+        <a href='javascript:void(0)' onclick='javascript:newGoogleAuthBetaTry()'>Click here to try out the BETA version!</a>
           
         <hr>
 
diff --git a/client/app.tt b/client/app.tt
index e2389698..e6de6901 100644
--- a/client/app.tt
+++ b/client/app.tt
@@ -6,9 +6,7 @@
     {{> modal id="app_load_modal" title="Starting up application" message="Hang tight..." with_bar=true }}
     {{> modal id="app_restart_modal" title="Restarting" message="The app is being restarted, please wait." with_bar=true }}
     {{> modal id="file_load_modal" title="Your file is being loaded" message="Depending on the file size, this can be long." with_bar=true }}
-    {{> modal id="auth_failed_modal" title="The authentication failed with Google" message="You need to enable the popups in your browser, then login in your Google account and accept the app's authorization requests." button_id="restart_app" button_text="Restart app" }}
     {{> modal id="error_modal" title="An unexpected error occurred with the provider server" message="The app flow will still continue but unexpected behavior may occur. When in doubt restart the app." dismiss=true }}
-    {{> modal id="auth_modal" title="You need to authorize this app to access your Google Drive" message="Make sure you grant access (check the boxes) for all the permissions the app needs in the next screen." button_id="start_g_oauth" button_text="Authorize!" }}
     {{> modal id="user_auth_modal" title="Switch user" message="In order to open this file, you need to switch user." button_id="switch_user" button_text="Switch user" }}
 
     {{> file_info }}
diff --git a/client/assets/js/Controller/Editor.js b/client/assets/js/Controller/Editor.js
index 204fc87f..dd6b6282 100644
--- a/client/assets/js/Controller/Editor.js
+++ b/client/assets/js/Controller/Editor.js
@@ -729,8 +729,11 @@ EditorController.prototype.open_share_modal = function() {
   }
 }
 
-EditorController.prototype.restart_app = function() {
+EditorController.prototype.restart_app = function(skipConfirm) {
   var self = this;
+  if(skipConfirm) {
+    window.location.reload();
+  }
   new Popup({ message : i18n("Are you sure ?"), callback : function(result) {if(result) window.location.reload()}, confirm : true});
 }
 
diff --git a/client/assets/js/Controller/OAuth.js b/client/assets/js/Controller/OAuth.js
index e4c6f63d..2344b2c1 100644
--- a/client/assets/js/Controller/OAuth.js
+++ b/client/assets/js/Controller/OAuth.js
@@ -6,13 +6,11 @@ function GoogleOAuthController(options){
   this.authed = false
   this.current_user = undefined
   this.client = undefined;
-  //this.init()
   this.queue = [];
 }
 
 GoogleOAuthController.prototype.init = function(){
   var self = this;
-  setTimeout(function(){self.check_authed()}, 15000)
   this.add_to_queue(function(){
     User.current_user(function(user){self.current_user = user});
   });
@@ -20,6 +18,11 @@ GoogleOAuthController.prototype.init = function(){
     application.propose_upgrade();
     self.keep_token_alive();
   });
+    
+
+  if(window.location.hash.match("^#google_access_token=")){
+    self.setToken(window.location.hash.replace("#google_access_token=", ""));
+  }
 
   if(!sessionStorage.access_token) {
     sessionStorage.access_token = getCookie("access_token");
@@ -34,86 +37,36 @@ GoogleOAuthController.prototype.init = function(){
     gapi.client.load('drive', 'v2', function(){
       gapi.load('picker', function() {
         var request = gapi.client.oauth2.userinfo.get();
-        application.controllers.google_oauth.execute_request(request, function(response){self.post_auth(true)})
+        application.controllers.google_oauth.execute_request(request, function(response){self.ready()})
       })
     })
   })
 }
 
-GoogleOAuthController.prototype.authorize_params = function(to_add) {
-  var self = this;
-  var base = {
-    client_id: self.client_id,
-    scope: self.scopes.join(" "),
-    ux_mode: 'popup',
-  };
-
-  if(User.get_session_user_id()){
-    base["user_id"] = User.get_session_user_id();
-  }
-
-  for (var attrname in to_add) { base[attrname] = to_add[attrname]; }
-
-  return base;
-}
-
-
 GoogleOAuthController.prototype.do_auth = function(user_id){
   var self = this
-  var isBack = false;
-
-  $('#auth_modal').modal('show')
-  $('#start_g_oauth').click(function(){
-    self.auth_popup(user_id)
-  })
-}
-
-GoogleOAuthController.prototype.auth_popup = function(user_id){
-  var self = this
-  //Do it without the immediate
-  var params = {callback: function(auth_result){self.post_auth(auth_result)}};
+  sessionStorage.google_auth_return_to = window.location;
+  var url = "/api/oauth2/google/authorize";
   if(user_id) {
-    params["hint"] = user_id;
+    url += "?login_hint="+user_id;
   }
-  this.client = google.accounts.oauth2.initTokenClient(self.authorize_params(params))
-  this.client.requestAccessToken();
+  window.location = url;
 }
 
 GoogleOAuthController.prototype.auth_with_user = function(user_id, callback){
   var self = this;
-  this.client = google.accounts.oauth2.initTokenClient(self.authorize_params({hint : user_id, callback: function(auth_result){
-    application.controllers.editor.reset_collaboration();
-    self.post_auth(auth_result);
-    callback();
-  }}));
-  this.client.requestAccessToken({login_hint:user_id});
+  self.do_auth(user_id);
 }
 
 GoogleOAuthController.prototype.switch_user = function() {
   var self = this;
-  var previous_user = self.current_user;
-  self.auth_with_user(undefined, function(){
-    $('#app_restart_modal').modal('show'); 
-    window.location.hash = '#new' ; 
-    window.location.reload()
-  })
+  self.do_auth();
 }
 
-GoogleOAuthController.prototype.post_auth = function(auth_result){
-  var self = this;
-  if (auth_result && !auth_result.error) {
-    if(auth_result['access_token']) {
-      setCookie('access_token', auth_result['access_token'], 1)
-      sessionStorage.access_token = auth_result['access_token'];
-      gapi.client.setToken({"access_token":auth_result['access_token']});
-    }
-    self.ready()
-    $('#auth_modal').modal('hide')
-    //cool it worked
-  }
-  else{
-    this.auth_failed();
-  }
+GoogleOAuthController.prototype.setToken = function(token) {
+  setCookie('access_token', token, 1);
+  sessionStorage.access_token = token;
+  gapi.client.setToken({"access_token":token});
 }
 
 GoogleOAuthController.prototype.ready = function(){
@@ -131,18 +84,8 @@ GoogleOAuthController.prototype.add_to_queue = function(to_do){
 }
 
 GoogleOAuthController.prototype.show_reauth = function(){
-  $('#reauthenticate_modal').modal('show')
-}
-
-GoogleOAuthController.prototype.auth_failed = function(){
-  //$('#auth_failed_modal').modal('show')
-
-}
-
-GoogleOAuthController.prototype.check_authed = function(){
-  if(!this.authed){
-    this.auth_failed()
-  }
+  StatIncrement.record("GoogleOAuthController.prototype.show_reauth");
+  new Popup({ message : i18n('Failed to communicate with Google servers. Please restart the app.'), callback : function(result) {if(result) application.controllers.editor.restart_app(true)}, confirm_btn : i18n('Restart now')});
 }
 
 GoogleOAuthController.prototype.execute_request = function(request, callback, options){
diff --git a/client/assets/js/Router/Editor.js b/client/assets/js/Router/Editor.js
index 8e5a7086..2623be68 100644
--- a/client/assets/js/Router/Editor.js
+++ b/client/assets/js/Router/Editor.js
@@ -17,7 +17,7 @@ function EditorRouter(controller){
 
 EditorRouter.prototype.recordhashUrl = function() {
   // we don't want to record the access token hash
-  if(!window.location.hash.match('^#access_token')){
+  if(!window.location.hash.match('^#access_token') && !window.location.hash.match('^#google_access_token')){
     setCookie("last_hash_url", window.location.hash, 1);
   }
 }
@@ -117,6 +117,9 @@ EditorRouter.prototype.route = function(){
         window.location.hash = getCookie("last_hash_url") || "#new/Dropbox";
       });
     },
+    handle_google_token: function(transition){
+      window.location = sessionStorage.google_auth_return_to || "#new/GoogleDrive";
+    },
   };
 
   var action = actions[transition.targetName];
@@ -129,6 +132,10 @@ EditorRouter.prototype.route = function(){
     actions.handle_dropbox_token();
   }
   
+  if(window.location.hash.match("^#google_access_token=")){
+    actions.handle_google_token();
+  }
+  
 // actions.redirect_new();
 } 
 
diff --git a/webserver/oauth2_handlers.go b/webserver/oauth2_handlers.go
index e0173b53..3aa89ca7 100644
--- a/webserver/oauth2_handlers.go
+++ b/webserver/oauth2_handlers.go
@@ -18,7 +18,7 @@ func getGoogleOauth2Conf(opts googleOauth2ConfOptions) *oauth2.Config {
 	var googleOauth2Conf = &oauth2.Config{
 		ClientID:     os.Getenv("GOOGLE_CLIENT_ID"),
 		ClientSecret: os.Getenv("GOOGLE_CLIENT_SECRET"),
-		RedirectURL:  os.Getenv("APP_BASE_URL") + "/api/oauth2/google/callback",
+		RedirectURL:  appBaseURL + "/api/oauth2/google/callback",
 		Scopes: []string{
 			"https://www.googleapis.com/auth/drive.file",
 			"https://www.googleapis.com/auth/userinfo.email",