diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index ef681cc9a..eda379d82 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -19,7 +19,6 @@ class Kernel extends ConsoleKernel
 
         $schedule->job(new InstanceDockerCleanupJob)->everyFiveMinutes();
         $schedule->job(new InstanceAutoUpdateJob)->everyFifteenMinutes();
-        // Disabled for now, added oom_kill_disable: true to docker-compose.yml
         // $schedule->job(new InstanceProxyCheckJob)->everyMinute();
     }
 
diff --git a/app/Http/Livewire/Project/Application/ResourceLimits.php b/app/Http/Livewire/Project/Application/ResourceLimits.php
index e0377b75e..161d29ecc 100644
--- a/app/Http/Livewire/Project/Application/ResourceLimits.php
+++ b/app/Http/Livewire/Project/Application/ResourceLimits.php
@@ -13,7 +13,6 @@ class ResourceLimits extends Component
         'application.limits_memory_swap' => 'required|string',
         'application.limits_memory_swappiness' => 'required|integer|min:0|max:100',
         'application.limits_memory_reservation' => 'required|string',
-        'application.limits_memory_oom_kill' => 'boolean',
         'application.limits_cpus' => 'nullable',
         'application.limits_cpuset' => 'nullable',
         'application.limits_cpu_shares' => 'nullable',
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index b96355d28..22880e116 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -316,7 +316,6 @@ COPY --from={$this->application->uuid}:{$this->git_commit}-build /app/{$this->ap
                     'memswap_limit' => $this->application->limits_memory_swap,
                     'mem_swappiness' => $this->application->limits_memory_swappiness,
                     'mem_reservation' => $this->application->limits_memory_reservation,
-                    'oom_kill_disable' => $this->application->limits_memory_oom_kill,
                     'cpus' => $this->application->limits_cpus,
                     'cpuset' => $this->application->limits_cpuset,
                     'cpu_shares' => $this->application->limits_cpu_shares,
diff --git a/app/Models/Application.php b/app/Models/Application.php
index ba3f56ac4..c4541e48a 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -43,7 +43,6 @@ class Application extends BaseModel
 
     public $casts = [
         'previews' => SchemalessAttributes::class,
-        'limits_memory_oom_kill' => 'boolean',
     ];
     public function scopeWithExtraAttributes(): Builder
     {
diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php
index 3b0c06973..7290ac834 100644
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -27,7 +27,6 @@ if (!function_exists('getProxyConfiguration')) {
             "networks" => $array_of_networks->toArray(),
             "services" => [
                 "traefik" => [
-                    "oom_kill_disable" => true,
                     "container_name" => "coolify-proxy",
                     "image" => "traefik:v2.10",
                     "restart" => "always",
diff --git a/database/migrations/2023_03_27_081716_create_applications_table.php b/database/migrations/2023_03_27_081716_create_applications_table.php
index b180ca8b9..e2116a437 100644
--- a/database/migrations/2023_03_27_081716_create_applications_table.php
+++ b/database/migrations/2023_03_27_081716_create_applications_table.php
@@ -59,7 +59,6 @@ return new class extends Migration
             $table->string('limits_memory_swap')->default("0");
             $table->integer('limits_memory_swappiness')->default(60);
             $table->string('limits_memory_reservation')->default("0");
-            $table->boolean('limits_memory_oom_kill')->default(false);
 
             $table->string('limits_cpus')->default("0");
             $table->string('limits_cpuset')->nullable()->default("0");
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 07b92e4b2..d7944b922 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,7 +1,6 @@
 version: '3.8'
 services:
   coolify:
-    oom_kill_disable: true
     image: "ghcr.io/coollabsio/coolify:${LATEST_IMAGE:-4.0.0-nightly.0}"
     volumes:
       - type: bind
@@ -42,7 +41,6 @@ services:
       postgres:
         condition: service_healthy
   postgres:
-    oom_kill_disable: true
     volumes:
       - coolify-db:/var/lib/postgresql/data
     environment:
@@ -61,7 +59,6 @@ services:
       retries: 5
       timeout: 2s
   redis:
-    oom_kill_disable: true
     command: redis-server --save 20 1 --loglevel warning --requirepass ${REDIS_PASSWORD}
     environment:
       REDIS_PASSWORD: "${REDIS_PASSWORD}"
diff --git a/resources/views/livewire/project/application/resource-limits.blade.php b/resources/views/livewire/project/application/resource-limits.blade.php
index 52eba5900..6e293df46 100644
--- a/resources/views/livewire/project/application/resource-limits.blade.php
+++ b/resources/views/livewire/project/application/resource-limits.blade.php
@@ -16,6 +16,5 @@
             id="application.limits_memory_swappiness" />
         <x-forms.input placeholder="69b or 420k or 1337m or 1g" label="Soft Limit"
             id="application.limits_memory_reservation" />
-        <x-forms.checkbox label="Disable OOM kill" id="application.limits_memory_oom_kill" />
     </form>
 </div>