diff --git a/server/model/user.go b/server/model/user.go
index f389be4df..4cc49b6c5 100644
--- a/server/model/user.go
+++ b/server/model/user.go
@@ -44,10 +44,10 @@ type User struct {
 	Login string `json:"login"  xorm:"UNIQUE 'login'"`
 
 	// AccessToken is the oauth2 access token.
-	AccessToken string `json:"-"  xorm:"TEXT 'token'"`
+	AccessToken string `json:"-"  xorm:"TEXT 'access_token'"`
 
 	// RefreshToken is the oauth2 refresh token.
-	RefreshToken string `json:"-" xorm:"TEXT 'secret'"`
+	RefreshToken string `json:"-" xorm:"TEXT 'refresh_token'"`
 
 	// Expiry is the AccessToken expiration timestamp (unix seconds).
 	Expiry int64 `json:"-" xorm:"expiry"`
diff --git a/server/queue/fifo_test.go b/server/queue/fifo_test.go
index 1ce4de008..90361255d 100644
--- a/server/queue/fifo_test.go
+++ b/server/queue/fifo_test.go
@@ -35,7 +35,7 @@ var (
 			Data: []byte("{}"),
 		}
 	}
-	waitForProcess = func() { time.Sleep(processTimeInterval + 10*time.Millisecond) }
+	waitForProcess = func() { time.Sleep(processTimeInterval + 50*time.Millisecond) }
 )
 
 func TestFifo(t *testing.T) {
@@ -83,10 +83,10 @@ func TestFifoExpire(t *testing.T) {
 	assert.Len(t, info.Pending, 1, "expect task in pending queue")
 
 	got, err := q.Poll(ctx, 1, filterFnTrue)
-	waitForProcess()
 	assert.NoError(t, err)
 	assert.Equal(t, dummyTask, got)
 
+	waitForProcess()
 	info = q.Info(ctx)
 	assert.Len(t, info.Pending, 1, "expect task re-added to pending queue")
 }
diff --git a/server/store/datastore/migration/021_rename_token_fields.go b/server/store/datastore/migration/021_rename_token_fields.go
new file mode 100644
index 000000000..34d07b387
--- /dev/null
+++ b/server/store/datastore/migration/021_rename_token_fields.go
@@ -0,0 +1,41 @@
+// Copyright 2024 Woodpecker Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package migration
+
+import (
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+)
+
+var renameTokenFields = xormigrate.Migration{
+	ID: "rename-token-fields",
+	MigrateSession: func(sess *xorm.Session) (err error) {
+		type users struct {
+			AccessToken  string `xorm:"TEXT 'token'"`
+			RefreshToken string `xorm:"TEXT 'secret'"`
+		}
+
+		// ensure columns to rename exist
+		if err := sess.Sync(new(users)); err != nil {
+			return err
+		}
+
+		if err := renameColumn(sess, "users", "token", "access_token"); err != nil {
+			return err
+		}
+
+		return renameColumn(sess, "users", "secret", "refresh_token")
+	},
+}
diff --git a/server/store/datastore/migration/migration.go b/server/store/datastore/migration/migration.go
index 9fde10f54..8826f68f9 100644
--- a/server/store/datastore/migration/migration.go
+++ b/server/store/datastore/migration/migration.go
@@ -49,6 +49,7 @@ var migrationTasks = []*xormigrate.Migration{
 	&correctPotentialCorruptOrgsUsersRelation,
 	&gatedToRequireApproval,
 	&removeRepoNetrcOnlyTrusted,
+	&renameTokenFields,
 }
 
 var allBeans = []any{