diff --git a/src/charm.py b/src/charm.py
index 22f1b4dc4f..2c743a416c 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -1720,9 +1720,7 @@ def update_config(self, is_creating_backup: bool = False) -> bool:
                 logger.debug(
                     "Early exit update_config: patroni not responding but TLS is enabled."
                 )
-                self.unit_peer_data.update({"tls": "enabled"})
-                self.postgresql_client_relation.update_endpoints()
-                # self._handle_postgresql_restart_need(True)
+                self._handle_postgresql_restart_need(True)
                 return True
             logger.debug("Early exit update_config: Patroni not started yet")
             return False
diff --git a/tests/integration/ha_tests/test_upgrade.py b/tests/integration/ha_tests/test_upgrade.py
index 497c7ace9a..520451f831 100644
--- a/tests/integration/ha_tests/test_upgrade.py
+++ b/tests/integration/ha_tests/test_upgrade.py
@@ -30,6 +30,7 @@
 
 
 @pytest.mark.group(1)
+@pytest.mark.unstable
 @pytest.mark.abort_on_fail
 async def test_deploy_latest(ops_test: OpsTest) -> None:
     """Simple test to ensure that the PostgreSQL and application charms get deployed."""
@@ -53,6 +54,7 @@ async def test_deploy_latest(ops_test: OpsTest) -> None:
 
 
 @pytest.mark.group(1)
+@pytest.mark.unstable
 @pytest.mark.abort_on_fail
 async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
     """Test that the pre-upgrade-check action runs successfully."""
@@ -66,6 +68,7 @@ async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
 
 
 @pytest.mark.group(1)
+@pytest.mark.unstable
 @pytest.mark.abort_on_fail
 async def test_upgrade_from_edge(ops_test: OpsTest, continuous_writes) -> None:
     # Start an application that continuously writes data to the database.
@@ -116,6 +119,7 @@ async def test_upgrade_from_edge(ops_test: OpsTest, continuous_writes) -> None:
 
 
 @pytest.mark.group(1)
+@pytest.mark.unstable
 @pytest.mark.abort_on_fail
 async def test_fail_and_rollback(ops_test, continuous_writes) -> None:
     # Start an application that continuously writes data to the database.
diff --git a/tests/integration/ha_tests/test_upgrade_from_stable.py b/tests/integration/ha_tests/test_upgrade_from_stable.py
index fd75c93f2b..36a2f0c24c 100644
--- a/tests/integration/ha_tests/test_upgrade_from_stable.py
+++ b/tests/integration/ha_tests/test_upgrade_from_stable.py
@@ -26,6 +26,7 @@
 
 
 @pytest.mark.group(1)
+@pytest.mark.unstable
 @pytest.mark.abort_on_fail
 async def test_deploy_stable(ops_test: OpsTest) -> None:
     """Simple test to ensure that the PostgreSQL and application charms get deployed."""
@@ -77,6 +78,7 @@ async def test_deploy_stable(ops_test: OpsTest) -> None:
 
 
 @pytest.mark.group(1)
+@pytest.mark.unstable
 @pytest.mark.abort_on_fail
 async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
     """Test that the pre-upgrade-check action runs successfully."""
@@ -95,6 +97,7 @@ async def test_pre_upgrade_check(ops_test: OpsTest) -> None:
 
 
 @pytest.mark.group(1)
+@pytest.mark.unstable
 @pytest.mark.abort_on_fail
 async def test_upgrade_from_stable(ops_test: OpsTest):
     """Test updating from stable channel."""
diff --git a/tests/integration/test_subordinates.py b/tests/integration/test_subordinates.py
index 2e2772236b..11a5f74028 100644
--- a/tests/integration/test_subordinates.py
+++ b/tests/integration/test_subordinates.py
@@ -33,7 +33,7 @@ async def test_deploy(ops_test: OpsTest, charm: str, github_secrets):
         ops_test.model.deploy(
             UBUNTU_PRO_APP_NAME,
             config={"token": github_secrets["UBUNTU_PRO_TOKEN"]},
-            channel="latest/edge",
+            channel="noble/edge",
             num_units=0,
         ),
         ops_test.model.deploy(