diff --git a/runtime-light/k2-platform/k2-api.h b/runtime-light/k2-platform/k2-api.h
index 9eb8f2b445..26b3e5e775 100644
--- a/runtime-light/k2-platform/k2-api.h
+++ b/runtime-light/k2-platform/k2-api.h
@@ -29,11 +29,19 @@
 
 namespace k2 {
 
-namespace k2_impl_ {
+namespace details {
 
 inline constexpr size_t DEFAULT_MEMORY_ALIGN = 16;
 
-} // namespace k2_impl_
+#define TLS_INITIAL_EXEC __attribute__((tls_model("initial-exec")))
+
+TLS_INITIAL_EXEC inline thread_local const ImageState* image_state_ptr{};         // NOLINT
+TLS_INITIAL_EXEC inline thread_local const ComponentState* component_state_ptr{}; // NOLINT
+TLS_INITIAL_EXEC inline thread_local InstanceState* instance_state_ptr{};         // NOLINT
+
+#undef TLS_INITIAL_EXEC
+
+} // namespace details
 
 inline constexpr int32_t errno_ok = 0;
 inline constexpr int32_t errno_e2big = E2BIG;
@@ -82,15 +90,15 @@ inline const ControlFlags* control_flags() noexcept {
 }
 
 inline const ImageState* image_state() noexcept {
-  return k2_image_state();
+  return details::image_state_ptr;
 }
 
 inline const ComponentState* component_state() noexcept {
-  return k2_component_state();
+  return details::component_state_ptr;
 }
 
 inline InstanceState* instance_state() noexcept {
-  return k2_instance_state();
+  return details::instance_state_ptr;
 }
 
 inline void* alloc_align(size_t size, size_t align) noexcept {
@@ -98,7 +106,7 @@ inline void* alloc_align(size_t size, size_t align) noexcept {
 }
 
 inline void* alloc(size_t size) noexcept {
-  return k2::alloc_align(size, k2_impl_::DEFAULT_MEMORY_ALIGN);
+  return k2::alloc_align(size, details::DEFAULT_MEMORY_ALIGN);
 }
 
 inline void* realloc(void* ptr, size_t new_size) noexcept {
diff --git a/runtime-light/runtime-light.cpp b/runtime-light/runtime-light.cpp
index 7e6bbd7c38..e65f3a0966 100644
--- a/runtime-light/runtime-light.cpp
+++ b/runtime-light/runtime-light.cpp
@@ -7,6 +7,7 @@
 #include "runtime-light/core/globals/php-init-scripts.h"
 #include "runtime-light/coroutine/io-scheduler.h"
 #include "runtime-light/k2-platform/k2-api.h"
+#include "runtime-light/k2-platform/k2-header.h"
 #include "runtime-light/state/component-state.h"
 #include "runtime-light/state/image-state.h"
 #include "runtime-light/state/instance-state.h"
@@ -15,43 +16,53 @@
 #define VISIBILITY_DEFAULT __attribute__((visibility("default")))
 
 VISIBILITY_DEFAULT ImageState* k2_create_image() {
-  kphp::log::debug("start image state creation, requested {} bytes", sizeof(ImageState));
-  auto* image_state_ptr{static_cast<ImageState*>(k2::alloc(sizeof(ImageState)))};
-  kphp::log::assertion(image_state_ptr != nullptr); // Not enough memory for image state
-  kphp::log::debug("finish image state creation");
-  return image_state_ptr;
+  k2::details::image_state_ptr = nullptr;
+  k2::details::component_state_ptr = nullptr;
+  k2::details::instance_state_ptr = nullptr;
+  return static_cast<ImageState*>(k2::alloc_align(sizeof(ImageState), alignof(ImageState)));
 }
 
 VISIBILITY_DEFAULT void k2_init_image() {
-  kphp::log::debug("start image state init");
+  k2::details::image_state_ptr = k2_image_state();
+  k2::details::component_state_ptr = nullptr;
+  k2::details::instance_state_ptr = nullptr;
   new (const_cast<ImageState*>(k2::image_state())) ImageState{};
   init_php_scripts_once_in_master();
-  kphp::log::debug("finish image state init");
 }
 
 VISIBILITY_DEFAULT ComponentState* k2_create_component() {
+  k2::details::image_state_ptr = k2_image_state();
+  k2::details::component_state_ptr = nullptr;
+  k2::details::instance_state_ptr = nullptr;
   kphp::log::debug("start component state creation, requested {} bytes", sizeof(ComponentState));
-  auto* component_state_ptr{static_cast<ComponentState*>(k2::alloc(sizeof(ComponentState)))};
-  kphp::log::assertion(component_state_ptr != nullptr); // Not enough memory for component state
+  auto* component_state_ptr{static_cast<ComponentState*>(k2::alloc_align(sizeof(ComponentState), alignof(ComponentState)))};
   kphp::log::debug("finish component state creation");
   return component_state_ptr;
 }
 
 VISIBILITY_DEFAULT void k2_init_component() {
+  k2::details::image_state_ptr = k2_image_state();
+  k2::details::component_state_ptr = k2_component_state();
+  k2::details::instance_state_ptr = nullptr;
   kphp::log::debug("start component state init");
   new (const_cast<ComponentState*>(k2::component_state())) ComponentState{};
   kphp::log::debug("finish component state init");
 }
 
 VISIBILITY_DEFAULT InstanceState* k2_create_instance() {
+  k2::details::image_state_ptr = k2_image_state();
+  k2::details::component_state_ptr = k2_component_state();
+  k2::details::instance_state_ptr = nullptr;
   kphp::log::debug("start instance state creation, requested {} bytes", sizeof(InstanceState));
-  auto* instance_state_ptr{static_cast<InstanceState*>(k2::alloc(sizeof(InstanceState)))};
-  kphp::log::assertion(instance_state_ptr != nullptr); // Not enough memory for instance state
+  auto* instance_state_ptr{static_cast<InstanceState*>(k2::alloc_align(sizeof(InstanceState), alignof(InstanceState)))};
   kphp::log::debug("finish instance state creation");
   return instance_state_ptr;
 }
 
 VISIBILITY_DEFAULT void k2_init_instance() {
+  k2::details::image_state_ptr = k2_image_state();
+  k2::details::component_state_ptr = k2_component_state();
+  k2::details::instance_state_ptr = k2_instance_state();
   kphp::log::debug("start instance state init");
   new (k2::instance_state()) InstanceState{};
   k2::instance_state()->init_script_execution();
@@ -59,6 +70,9 @@ VISIBILITY_DEFAULT void k2_init_instance() {
 }
 
 VISIBILITY_DEFAULT k2::PollStatus k2_poll() {
+  k2::details::image_state_ptr = k2_image_state();
+  k2::details::component_state_ptr = k2_component_state();
+  k2::details::instance_state_ptr = k2_instance_state();
   kphp::log::debug("k2_poll started");
   const auto poll_status{kphp::coro::io_scheduler::get().process_events()};
   kphp::log::debug("k2_poll finished: {}", std::to_underlying(poll_status));