diff --git a/CHANGELOG.md b/CHANGELOG.md
index d67cdb3..be5ccd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,18 @@ Release dates will be in YYYY-MM-DD format.
 
 ## Unreleased
 
-## 6.3.0 - 2024-04-04
+## 7.0.0 - 2024-04-05
+
+### Changed
+- Each access-key now retains its own session-token to make switching between access-keys easier.
+- When rotation a key, it will first try to use the session-token of the key to be rotated. If that fails, it will fetch a new session-token automatically.
+- Set and rotate access keys are now directly in the menu instead of in a submenu
+
+### Fixed
+- Fix setting of access keys
+- Rotation of access keys that are not named 'access-key'
+
+## 6.3.0 - 2024-04-04 (yanked)
 
 ### Added
 - Support for Google cloud projects (thanks to @3cham)
diff --git a/app/__version__.py b/app/__version__.py
index b99fcb0..ac5def1 100644
--- a/app/__version__.py
+++ b/app/__version__.py
@@ -1,2 +1,2 @@
-__version__ = (6, 3, 0)
+__version__ = (7, 0, 0)
 __version_string__ = '.'.join(str(i) for i in __version__)
diff --git a/app/gui/trayicon.py b/app/gui/trayicon.py
index 67c6a0d..9b3c567 100644
--- a/app/gui/trayicon.py
+++ b/app/gui/trayicon.py
@@ -71,20 +71,18 @@ def populate_context_menu(self, profile_list: List[ProfileGroup]):
         # region overwrite
         for region in regions.region_list:
             region_action = self.region_menu.addAction(region)
-            region_action.triggered.connect(partial(self.set_override_region,
-                                                    region=region))
+            region_action.triggered.connect(partial(self.set_override_region, region=region))
+
+        # access keys
+        self.add_access_key_action = menu.addAction('Set access key')
+        self.add_access_key_action.triggered.connect(self.gui.show_set_key_dialog)
+        self.rotate_access_key_action = menu.addAction('Rotate access key')
+        self.rotate_access_key_action.triggered.connect(self.gui.show_access_key_rotation_dialog)
 
         menu.addSeparator()
         self.config_action = menu.addAction('Edit config')
         self.config_action.triggered.connect(self.gui.show_config_dialog)
 
-        key_menu = QMenu('Access Key', menu)
-        menu.addMenu(key_menu)
-        self.add_access_key_action = key_menu.addAction('Set access key')
-        self.add_access_key_action.triggered.connect(self.gui.show_set_key_dialog)
-        self.rotate_access_key_action = key_menu.addAction('Rotate access key')
-        self.rotate_access_key_action.triggered.connect(self.gui.show_access_key_rotation_dialog)
-
         menu.addSeparator()
         self.log_action = menu.addAction("Show logs")
         self.log_action.triggered.connect(self.gui.show_logs)