diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
index 7d3d64bee..16733a298 100644
--- a/app/Livewire/Project/Application/General.php
+++ b/app/Livewire/Project/Application/General.php
@@ -622,6 +622,7 @@ public function updatedIsStatic($value)
 
     public function updatedBuildPack()
     {
+        $originalBuildPack = $this->application->getOriginal('build_pack');
         // Check if user has permission to update
         try {
             $this->authorize('update', $this->application);
diff --git a/app/Models/Application.php b/app/Models/Application.php
index c2ba6e773..306c9bd7a 100644
--- a/app/Models/Application.php
+++ b/app/Models/Application.php
@@ -188,16 +188,13 @@ protected static function booted()
 
                     // Remove SERVICE_FQDN_* and SERVICE_URL_* environment variables
                     $application->environment_variables()
-                        ->where(function ($q) {
-                            $q->where('key', 'LIKE', 'SERVICE_FQDN_%')
-                                ->orWhere('key', 'LIKE', 'SERVICE_URL_%');
-                        })
+                        ->where('key', 'LIKE', 'SERVICE_FQDN_%')
+                        ->orWhere('key', 'LIKE', 'SERVICE_URL_%')
                         ->delete();
+
                     $application->environment_variables_preview()
-                        ->where(function ($q) {
-                            $q->where('key', 'LIKE', 'SERVICE_FQDN_%')
-                                ->orWhere('key', 'LIKE', 'SERVICE_URL_%');
-                        })
+                        ->where('key', 'LIKE', 'SERVICE_FQDN_%')
+                        ->orWhere('key', 'LIKE', 'SERVICE_URL_%')
                         ->delete();
                 }