diff --git a/CHANGELOG.md b/CHANGELOG.md
index d04c0294..9fec0b61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 2026-08-18
+
+* Fixed
+  * Apps that ship in the image are no longer sent to the marketplace, so listing
+    one in `OWNCLOUD_APPS_INSTALL` no longer aborts the container startup. A
+    failing marketplace install now logs why it failed
+    [#539](https://github.com/owncloud-docker/base/issues/539)
+
+* Changed
+  * Removed env variable `OWNCLOUD_MARKETPLACE_KEY` (and its
+    `OWNCLOUD_MARKETPLACE_APIKEY` fallback) for the `marketplace.key` config key,
+    as marketplace API keys no longer exist
+    [#540](https://github.com/owncloud-docker/base/issues/540)
+
 ## 2026-07-09
 
 * Added
diff --git a/ENVIRONMENT.md b/ENVIRONMENT.md
index edd282b7..7a4d0f1f 100644
--- a/ENVIRONMENT.md
+++ b/ENVIRONMENT.md
@@ -217,8 +217,6 @@
   Enable maintenance mode to disable ownCloud (see [documentation](https://doc.owncloud.com/server/latest/admin_manual/configuration/server/config_sample_php_parameters.html#enable-maintenance-mode-to-disable-owncloud)).
 - `OWNCLOUD_MARKETPLACE_CA=` \
   Developer option to connect to Marketplace testing instances.
-- `OWNCLOUD_MARKETPLACE_KEY=${OWNCLOUD_MARKETPLACE_APIKEY}` \
-  Developer option to get access to unreleased Apps in your Marketplace account.
 - `OWNCLOUD_MEMCACHED_ENABLED=false` \
   Enabled memory caching via memcached (see [documentation](https://doc.owncloud.com/server/latest/admin_manual/configuration/server/config_sample_php_parameters.html#memory-caching-backend-for-distributed-data)).
 - `OWNCLOUD_MEMCACHED_HOST=memcached` \
diff --git a/v22.04/overlay/etc/entrypoint.d/55-marketplace.sh b/v22.04/overlay/etc/entrypoint.d/55-marketplace.sh
index 2ae0d46e..7b15e780 100755
--- a/v22.04/overlay/etc/entrypoint.d/55-marketplace.sh
+++ b/v22.04/overlay/etc/entrypoint.d/55-marketplace.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-declare -x OWNCLOUD_MARKETPLACE_KEY
-[[ -z "${OWNCLOUD_MARKETPLACE_KEY}" ]] && OWNCLOUD_MARKETPLACE_KEY="${OWNCLOUD_MARKETPLACE_APIKEY}"
-
 declare -x OWNCLOUD_MARKETPLACE_CA
 [[ -z "${OWNCLOUD_MARKETPLACE_CA}" ]] && OWNCLOUD_MARKETPLACE_CA=""
 
diff --git a/v22.04/overlay/etc/owncloud.d/40-apps.sh b/v22.04/overlay/etc/owncloud.d/40-apps.sh
index bbd75d69..325d84a6 100755
--- a/v22.04/overlay/etc/owncloud.d/40-apps.sh
+++ b/v22.04/overlay/etc/owncloud.d/40-apps.sh
@@ -18,13 +18,17 @@ if [[ -n "${OWNCLOUD_APPS_INSTALL}" ]]; then
       echo "Deleting ${NAME} tarball..."
       rm -f "/tmp/${NAME}"
     else
-      if [[ ! -d ${OWNCLOUD_VOLUME_APPS}/${VAL} ]]; then
+      if [[ ! -d ${OWNCLOUD_VOLUME_APPS}/${VAL} && ! -d /var/www/owncloud/apps/${VAL} ]]; then
         echo "Installing ${VAL} app..."
-        occ market:install -n "${VAL}"
-      fi
+        if ! occ market:install -n "${VAL}"; then
+          echo "ERROR: failed to install app '${VAL}' from the marketplace." >&2
+          echo "       If '${VAL}' ships with the image, list it in OWNCLOUD_APPS_ENABLE instead of OWNCLOUD_APPS_INSTALL." >&2
+          exit 1
+        fi
 
-      if [[ $OWNCLOUD_APPS_INSTALL_MAJOR == "true" ]]; then
-        occ market:upgrade -n -q --major "${VAL}"
+        if [[ $OWNCLOUD_APPS_INSTALL_MAJOR == "true" ]]; then
+          occ market:upgrade -n -q --major "${VAL}"
+        fi
       fi
     fi
   done
diff --git a/v22.04/overlay/etc/templates/config.php b/v22.04/overlay/etc/templates/config.php
index d2730f52..a1eb5cf6 100644
--- a/v22.04/overlay/etc/templates/config.php
+++ b/v22.04/overlay/etc/templates/config.php
@@ -473,10 +473,6 @@ function getConfigFromEnv() {
     $config['license-class'] = getenv('OWNCLOUD_LICENSE_CLASS');
   }
 
-  if (getenv('OWNCLOUD_MARKETPLACE_KEY') != '') {
-    $config['marketplace.key'] = getenv('OWNCLOUD_MARKETPLACE_KEY');
-  }
-
   if (getenv('OWNCLOUD_MARKETPLACE_CA') != '') {
     $config['marketplace.ca'] = getenv('OWNCLOUD_MARKETPLACE_CA');
   }
diff --git a/v24.04/overlay/etc/entrypoint.d/55-marketplace.sh b/v24.04/overlay/etc/entrypoint.d/55-marketplace.sh
index 2ae0d46e..7b15e780 100755
--- a/v24.04/overlay/etc/entrypoint.d/55-marketplace.sh
+++ b/v24.04/overlay/etc/entrypoint.d/55-marketplace.sh
@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
 
-declare -x OWNCLOUD_MARKETPLACE_KEY
-[[ -z "${OWNCLOUD_MARKETPLACE_KEY}" ]] && OWNCLOUD_MARKETPLACE_KEY="${OWNCLOUD_MARKETPLACE_APIKEY}"
-
 declare -x OWNCLOUD_MARKETPLACE_CA
 [[ -z "${OWNCLOUD_MARKETPLACE_CA}" ]] && OWNCLOUD_MARKETPLACE_CA=""
 
diff --git a/v24.04/overlay/etc/owncloud.d/40-apps.sh b/v24.04/overlay/etc/owncloud.d/40-apps.sh
index bbd75d69..325d84a6 100755
--- a/v24.04/overlay/etc/owncloud.d/40-apps.sh
+++ b/v24.04/overlay/etc/owncloud.d/40-apps.sh
@@ -18,13 +18,17 @@ if [[ -n "${OWNCLOUD_APPS_INSTALL}" ]]; then
       echo "Deleting ${NAME} tarball..."
       rm -f "/tmp/${NAME}"
     else
-      if [[ ! -d ${OWNCLOUD_VOLUME_APPS}/${VAL} ]]; then
+      if [[ ! -d ${OWNCLOUD_VOLUME_APPS}/${VAL} && ! -d /var/www/owncloud/apps/${VAL} ]]; then
         echo "Installing ${VAL} app..."
-        occ market:install -n "${VAL}"
-      fi
+        if ! occ market:install -n "${VAL}"; then
+          echo "ERROR: failed to install app '${VAL}' from the marketplace." >&2
+          echo "       If '${VAL}' ships with the image, list it in OWNCLOUD_APPS_ENABLE instead of OWNCLOUD_APPS_INSTALL." >&2
+          exit 1
+        fi
 
-      if [[ $OWNCLOUD_APPS_INSTALL_MAJOR == "true" ]]; then
-        occ market:upgrade -n -q --major "${VAL}"
+        if [[ $OWNCLOUD_APPS_INSTALL_MAJOR == "true" ]]; then
+          occ market:upgrade -n -q --major "${VAL}"
+        fi
       fi
     fi
   done
diff --git a/v24.04/overlay/etc/templates/config.php b/v24.04/overlay/etc/templates/config.php
index 26e92fae..bc54b4b4 100644
--- a/v24.04/overlay/etc/templates/config.php
+++ b/v24.04/overlay/etc/templates/config.php
@@ -570,10 +570,6 @@ function getConfigFromEnv() {
     $config['license-class'] = getenv('OWNCLOUD_LICENSE_CLASS');
   }
 
-  if (getenv('OWNCLOUD_MARKETPLACE_KEY') != '') {
-    $config['marketplace.key'] = getenv('OWNCLOUD_MARKETPLACE_KEY');
-  }
-
   if (getenv('OWNCLOUD_MARKETPLACE_CA') != '') {
     $config['marketplace.ca'] = getenv('OWNCLOUD_MARKETPLACE_CA');
   }