diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b863d47b..f525fea86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Generate new policy scaffold from the CLI [PR #682](https://github.com/3scale/apicast/pull/682)
 - 3scale batcher policy [PR #685](https://github.com/3scale/apicast/pull/685)
 
+### Changed
+
+- `THREESCALE_PORTAL_ENDPOINT` and `THREESCALE_CONFIG_FILE` are not required anymore [PR #702](https://github.com/3scale/apicast/pull/702)
+
 ## [3.2.0-rc2] - 2018-05-11
 
 ### Added
diff --git a/gateway/.s2i/bin/run b/gateway/.s2i/bin/run
index 1ca62af22..62fce5f44 100755
--- a/gateway/.s2i/bin/run
+++ b/gateway/.s2i/bin/run
@@ -10,22 +10,6 @@ if [ -f "${luarocks}" ]; then
   eval `/opt/app/bin/luarocks path`
 fi
 
-APICAST_CONFIGURATION_CACHE=${APICAST_CONFIGURATION_CACHE:-}
-
-if [ "${APICAST_CONFIGURATION_CACHE:-0}" -gt 0 ] && [ "${APICAST_CONFIGURATION_CACHE}" -lt 60 ]; then
-  echo "APICAST_CONFIGURATION_CACHE should be 60 or greater, 0 or unset"
-  exit 1
-fi
-
-THREESCALE_PORTAL_ENDPOINT="${THREESCALE_PORTAL_ENDPOINT:-}"
-THREESCALE_CONFIG_FILE="${THREESCALE_CONFIG_FILE:-}"
-
-if [ -z "${THREESCALE_PORTAL_ENDPOINT:-}" ] && [ -z "${THREESCALE_CONFIG_FILE:-}" ]; then
-  # TODO: improve the error messsage
-  echo "missing either THREESCALE_PORTAL_ENDPOINT or THREESCALE_CONFIG_FILE environment variable"
-  exit 1
-fi
-
 if [ -f bin/apicast ]; then
   apicast=bin/apicast
 elif [ -f "${BASH_SOURCE%/*}/apicast" ]; then