diff --git a/CHANGELOG.md b/CHANGELOG.md
index 098e76ff3..ecf2e0d00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [6.21.1](https://github.com/adobe/helix-sidekick-extension/compare/v6.21.0...v6.21.1) (2023-06-08)
+
+
+### Bug Fixes
+
+* wrong previewHost/liveHost handling ([d5af488](https://github.com/adobe/helix-sidekick-extension/commit/d5af4885a6981d3db631e4241e2f1bf39cf5d039))
+
 # [6.21.0](https://github.com/adobe/helix-sidekick-extension/compare/v6.20.0...v6.21.0) (2023-06-06)
 
 
diff --git a/package.json b/package.json
index 7ffd640d8..4e092e4bb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adobe/helix-sidekick-extension",
-  "version": "6.21.0",
+  "version": "6.21.1",
   "description": "AEM Sidekick Extension",
   "type": "module",
   "scripts": {
diff --git a/src/safari/helix-sidekick-extension.xcodeproj/project.pbxproj b/src/safari/helix-sidekick-extension.xcodeproj/project.pbxproj
index 9b4fe577f..8493b20f8 100644
--- a/src/safari/helix-sidekick-extension.xcodeproj/project.pbxproj
+++ b/src/safari/helix-sidekick-extension.xcodeproj/project.pbxproj
@@ -719,7 +719,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "6.21.0";
+				CURRENT_PROJECT_VERSION = "6.21.1";
 				DEVELOPMENT_TEAM = JQ525L2MZD;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (Extension)/Info.plist";
@@ -731,7 +731,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = "6.21.0";
+				MARKETING_VERSION = "6.21.1";
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -750,7 +750,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "6.21.0";
+				CURRENT_PROJECT_VERSION = "6.21.1";
 				DEVELOPMENT_TEAM = JQ525L2MZD;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (Extension)/Info.plist";
@@ -762,7 +762,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = "6.21.0";
+				MARKETING_VERSION = "6.21.1";
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -785,7 +785,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "6.21.0";
+				CURRENT_PROJECT_VERSION = "6.21.1";
 				DEVELOPMENT_TEAM = JQ525L2MZD;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (App)/Info.plist";
@@ -801,7 +801,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = "6.21.0";
+				MARKETING_VERSION = "6.21.1";
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -824,7 +824,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "6.21.0";
+				CURRENT_PROJECT_VERSION = "6.21.1";
 				DEVELOPMENT_TEAM = JQ525L2MZD;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "iOS (App)/Info.plist";
@@ -840,7 +840,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = "6.21.0";
+				MARKETING_VERSION = "6.21.1";
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -862,7 +862,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "macOS (Extension)/AEM Sidekick.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "6.21.0";
+				CURRENT_PROJECT_VERSION = "6.21.1";
 				DEVELOPMENT_TEAM = JQ525L2MZD;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -875,7 +875,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = "6.21.0";
+				MARKETING_VERSION = "6.21.1";
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -894,7 +894,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = "macOS (Extension)/AEM Sidekick.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "6.21.0";
+				CURRENT_PROJECT_VERSION = "6.21.1";
 				DEVELOPMENT_TEAM = JQ525L2MZD;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -907,7 +907,7 @@
 					"@executable_path/../../../../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = "6.21.0";
+				MARKETING_VERSION = "6.21.1";
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -929,7 +929,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "macOS (App)/AEM Sidekick.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "6.21.0";
+				CURRENT_PROJECT_VERSION = "6.21.1";
 				DEVELOPMENT_TEAM = JQ525L2MZD;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -943,7 +943,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = "6.21.0";
+				MARKETING_VERSION = "6.21.1";
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,
@@ -966,7 +966,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "macOS (App)/AEM Sidekick.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = "6.21.0";
+				CURRENT_PROJECT_VERSION = "6.21.1";
 				DEVELOPMENT_TEAM = JQ525L2MZD;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -980,7 +980,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
-				MARKETING_VERSION = "6.21.0";
+				MARKETING_VERSION = "6.21.1";
 				OTHER_LDFLAGS = (
 					"-framework",
 					SafariServices,